tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
MIPS: O32 compat/N32: Fix to use compat syscall wrappers for AIO syscalls.
MAINTAINERS: Change list for ioc_serial to linux-serial.
SERIAL: ioc3_serial: Return -ENOMEM on memory allocation failure
MIPS: jz4740: Fix Kbuild Platform file.
MIPS: Repair Kbuild make clean breakage.

Linus Torvalds 7d7c4d06 531295e6

+14 -9
+1 -1
MAINTAINERS
··· 3162 3162 3163 3163 IOC3 SERIAL DRIVER 3164 3164 M: Pat Gefre <pfg@sgi.com> 3165 - L: linux-mips@linux-mips.org 3165 + L: linux-serial@vger.kernel.org 3166 3166 S: Maintained 3167 3167 F: drivers/serial/ioc3_serial.c 3168 3168
+4
arch/mips/Kbuild
··· 7 7 include arch/mips/Kbuild.platforms 8 8 obj-y := $(platform-y) 9 9 10 + # make clean traverses $(obj-) without having included .config, so 11 + # everything ends up here 12 + obj- := $(platform-) 13 + 10 14 # mips object files 11 15 # The object files are linked as core-y files would be linked 12 16
+1 -1
arch/mips/dec/Platform
··· 1 1 # 2 2 # DECstation family 3 3 # 4 - platform-$(CONFIG_MACH_DECSTATION) = dec/ 4 + platform-$(CONFIG_MACH_DECSTATION) += dec/ 5 5 cflags-$(CONFIG_MACH_DECSTATION) += \ 6 6 -I$(srctree)/arch/mips/include/asm/mach-dec 7 7 libs-$(CONFIG_MACH_DECSTATION) += arch/mips/dec/prom/
+1 -1
arch/mips/jz4740/Platform
··· 1 - core-$(CONFIG_MACH_JZ4740) += arch/mips/jz4740/ 1 + platform-$(CONFIG_MACH_JZ4740) += jz4740/ 2 2 cflags-$(CONFIG_MACH_JZ4740) += -I$(srctree)/arch/mips/include/asm/mach-jz4740 3 3 load-$(CONFIG_MACH_JZ4740) += 0xffffffff80010000
+3 -3
arch/mips/kernel/scall64-n32.S
··· 322 322 PTR sys_cacheflush 323 323 PTR sys_cachectl 324 324 PTR sys_sysmips 325 - PTR sys_io_setup /* 6200 */ 325 + PTR compat_sys_io_setup /* 6200 */ 326 326 PTR sys_io_destroy 327 - PTR sys_io_getevents 328 - PTR sys_io_submit 327 + PTR compat_sys_io_getevents 328 + PTR compat_sys_io_submit 329 329 PTR sys_io_cancel 330 330 PTR sys_exit_group /* 6205 */ 331 331 PTR sys_lookup_dcookie
+3 -3
arch/mips/kernel/scall64-o32.S
··· 445 445 PTR compat_sys_futex 446 446 PTR compat_sys_sched_setaffinity 447 447 PTR compat_sys_sched_getaffinity /* 4240 */ 448 - PTR sys_io_setup 448 + PTR compat_sys_io_setup 449 449 PTR sys_io_destroy 450 - PTR sys_io_getevents 451 - PTR sys_io_submit 450 + PTR compat_sys_io_getevents 451 + PTR compat_sys_io_submit 452 452 PTR sys_io_cancel /* 4245 */ 453 453 PTR sys_exit_group 454 454 PTR sys32_lookup_dcookie
+1
drivers/serial/ioc3_serial.c
··· 2044 2044 if (!port) { 2045 2045 printk(KERN_WARNING 2046 2046 "IOC3 serial memory not available for port\n"); 2047 + ret = -ENOMEM; 2047 2048 goto out4; 2048 2049 } 2049 2050 spin_lock_init(&port->ip_lock);