iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* '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.
This commit is contained in:
Linus Torvalds 2010-10-20 13:18:21 -07:00
commit 7d7c4d06be
7 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -3162,7 +3162,7 @@ F: drivers/net/ioc3-eth.c
IOC3 SERIAL DRIVER IOC3 SERIAL DRIVER
M: Pat Gefre <pfg@sgi.com> M: Pat Gefre <pfg@sgi.com>
L: linux-mips@linux-mips.org L: linux-serial@vger.kernel.org
S: Maintained S: Maintained
F: drivers/serial/ioc3_serial.c F: drivers/serial/ioc3_serial.c

4
arch/mips/Kbuild
View File

@ -7,6 +7,10 @@ subdir-ccflags-y := -Werror
include arch/mips/Kbuild.platforms include arch/mips/Kbuild.platforms
obj-y := $(platform-y) obj-y := $(platform-y)
# make clean traverses $(obj-) without having included .config, so
# everything ends up here
obj- := $(platform-)
# mips object files # mips object files
# The object files are linked as core-y files would be linked # The object files are linked as core-y files would be linked

2
arch/mips/dec/Platform
View File

@ -1,7 +1,7 @@
# #
# DECstation family # DECstation family
# #
platform-$(CONFIG_MACH_DECSTATION) = dec/ platform-$(CONFIG_MACH_DECSTATION) += dec/
cflags-$(CONFIG_MACH_DECSTATION) += \ cflags-$(CONFIG_MACH_DECSTATION) += \
-I$(srctree)/arch/mips/include/asm/mach-dec -I$(srctree)/arch/mips/include/asm/mach-dec
libs-$(CONFIG_MACH_DECSTATION) += arch/mips/dec/prom/ libs-$(CONFIG_MACH_DECSTATION) += arch/mips/dec/prom/

2
arch/mips/jz4740/Platform
View File

@ -1,3 +1,3 @@
core-$(CONFIG_MACH_JZ4740) += arch/mips/jz4740/ platform-$(CONFIG_MACH_JZ4740) += jz4740/
cflags-$(CONFIG_MACH_JZ4740) += -I$(srctree)/arch/mips/include/asm/mach-jz4740 cflags-$(CONFIG_MACH_JZ4740) += -I$(srctree)/arch/mips/include/asm/mach-jz4740
load-$(CONFIG_MACH_JZ4740) += 0xffffffff80010000 load-$(CONFIG_MACH_JZ4740) += 0xffffffff80010000

6
arch/mips/kernel/scall64-n32.S
View File

@ -322,10 +322,10 @@ EXPORT(sysn32_call_table)
PTR sys_cacheflush PTR sys_cacheflush
PTR sys_cachectl PTR sys_cachectl
PTR sys_sysmips PTR sys_sysmips
PTR sys_io_setup /* 6200 */ PTR compat_sys_io_setup /* 6200 */
PTR sys_io_destroy PTR sys_io_destroy
PTR sys_io_getevents PTR compat_sys_io_getevents
PTR sys_io_submit PTR compat_sys_io_submit
PTR sys_io_cancel PTR sys_io_cancel
PTR sys_exit_group /* 6205 */ PTR sys_exit_group /* 6205 */
PTR sys_lookup_dcookie PTR sys_lookup_dcookie

6
arch/mips/kernel/scall64-o32.S
View File

@ -445,10 +445,10 @@ sys_call_table:
PTR compat_sys_futex PTR compat_sys_futex
PTR compat_sys_sched_setaffinity PTR compat_sys_sched_setaffinity
PTR compat_sys_sched_getaffinity /* 4240 */ PTR compat_sys_sched_getaffinity /* 4240 */
PTR sys_io_setup PTR compat_sys_io_setup
PTR sys_io_destroy PTR sys_io_destroy
PTR sys_io_getevents PTR compat_sys_io_getevents
PTR sys_io_submit PTR compat_sys_io_submit
PTR sys_io_cancel /* 4245 */ PTR sys_io_cancel /* 4245 */
PTR sys_exit_group PTR sys_exit_group
PTR sys32_lookup_dcookie PTR sys32_lookup_dcookie

1
drivers/serial/ioc3_serial.c
View File

@ -2044,6 +2044,7 @@ ioc3uart_probe(struct ioc3_submodule *is, struct ioc3_driver_data *idd)
if (!port) { if (!port) {
printk(KERN_WARNING printk(KERN_WARNING
"IOC3 serial memory not available for port\n"); "IOC3 serial memory not available for port\n");
ret = -ENOMEM;
goto out4; goto out4;
} }
spin_lock_init(&port->ip_lock); spin_lock_init(&port->ip_lock);