aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-20 16:18:21 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-20 16:18:21 -0400
commit7d7c4d06be246b249f0f7e0b7df2f73d09cc6376 (patch)
tree7c7d3314b7bea5fe932eb76d80d9a102ffcda204
parent531295e63be8c2b8b909d7400739e8b8df60d61f (diff)
parente2cc502c3f71d8de812893527dc435e61b7fe604 (diff)
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.
-rw-r--r--MAINTAINERS2
-rw-r--r--arch/mips/Kbuild4
-rw-r--r--arch/mips/dec/Platform2
-rw-r--r--arch/mips/jz4740/Platform2
-rw-r--r--arch/mips/kernel/scall64-n32.S6
-rw-r--r--arch/mips/kernel/scall64-o32.S6
-rw-r--r--drivers/serial/ioc3_serial.c1
7 files changed, 14 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 7679bf32f7bb..f2a2b8e647c5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3162,7 +3162,7 @@ F: drivers/net/ioc3-eth.c
3162 3162
3163IOC3 SERIAL DRIVER 3163IOC3 SERIAL DRIVER
3164M: Pat Gefre <pfg@sgi.com> 3164M: Pat Gefre <pfg@sgi.com>
3165L: linux-mips@linux-mips.org 3165L: linux-serial@vger.kernel.org
3166S: Maintained 3166S: Maintained
3167F: drivers/serial/ioc3_serial.c 3167F: drivers/serial/ioc3_serial.c
3168 3168
diff --git a/arch/mips/Kbuild b/arch/mips/Kbuild
index e322d65f33a4..7dd65cfae837 100644
--- a/arch/mips/Kbuild
+++ b/arch/mips/Kbuild
@@ -7,6 +7,10 @@ subdir-ccflags-y := -Werror
7include arch/mips/Kbuild.platforms 7include arch/mips/Kbuild.platforms
8obj-y := $(platform-y) 8obj-y := $(platform-y)
9 9
10# make clean traverses $(obj-) without having included .config, so
11# everything ends up here
12obj- := $(platform-)
13
10# mips object files 14# mips object files
11# The object files are linked as core-y files would be linked 15# The object files are linked as core-y files would be linked
12 16
diff --git a/arch/mips/dec/Platform b/arch/mips/dec/Platform
index 3adbcbd95db1..cf55a6f4e720 100644
--- a/arch/mips/dec/Platform
+++ b/arch/mips/dec/Platform
@@ -1,7 +1,7 @@
1# 1#
2# DECstation family 2# DECstation family
3# 3#
4platform-$(CONFIG_MACH_DECSTATION) = dec/ 4platform-$(CONFIG_MACH_DECSTATION) += dec/
5cflags-$(CONFIG_MACH_DECSTATION) += \ 5cflags-$(CONFIG_MACH_DECSTATION) += \
6 -I$(srctree)/arch/mips/include/asm/mach-dec 6 -I$(srctree)/arch/mips/include/asm/mach-dec
7libs-$(CONFIG_MACH_DECSTATION) += arch/mips/dec/prom/ 7libs-$(CONFIG_MACH_DECSTATION) += arch/mips/dec/prom/
diff --git a/arch/mips/jz4740/Platform b/arch/mips/jz4740/Platform
index 6a97230e3d05..ba91be9c21ef 100644
--- a/arch/mips/jz4740/Platform
+++ b/arch/mips/jz4740/Platform
@@ -1,3 +1,3 @@
1core-$(CONFIG_MACH_JZ4740) += arch/mips/jz4740/ 1platform-$(CONFIG_MACH_JZ4740) += jz4740/
2cflags-$(CONFIG_MACH_JZ4740) += -I$(srctree)/arch/mips/include/asm/mach-jz4740 2cflags-$(CONFIG_MACH_JZ4740) += -I$(srctree)/arch/mips/include/asm/mach-jz4740
3load-$(CONFIG_MACH_JZ4740) += 0xffffffff80010000 3load-$(CONFIG_MACH_JZ4740) += 0xffffffff80010000
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 38b226938db3..f08ece6d8acc 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -322,10 +322,10 @@ EXPORT(sysn32_call_table)
322 PTR sys_cacheflush 322 PTR sys_cacheflush
323 PTR sys_cachectl 323 PTR sys_cachectl
324 PTR sys_sysmips 324 PTR sys_sysmips
325 PTR sys_io_setup /* 6200 */ 325 PTR compat_sys_io_setup /* 6200 */
326 PTR sys_io_destroy 326 PTR sys_io_destroy
327 PTR sys_io_getevents 327 PTR compat_sys_io_getevents
328 PTR sys_io_submit 328 PTR compat_sys_io_submit
329 PTR sys_io_cancel 329 PTR sys_io_cancel
330 PTR sys_exit_group /* 6205 */ 330 PTR sys_exit_group /* 6205 */
331 PTR sys_lookup_dcookie 331 PTR sys_lookup_dcookie
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index 42fe14b52a33..78d768a3e19d 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -445,10 +445,10 @@ sys_call_table:
445 PTR compat_sys_futex 445 PTR compat_sys_futex
446 PTR compat_sys_sched_setaffinity 446 PTR compat_sys_sched_setaffinity
447 PTR compat_sys_sched_getaffinity /* 4240 */ 447 PTR compat_sys_sched_getaffinity /* 4240 */
448 PTR sys_io_setup 448 PTR compat_sys_io_setup
449 PTR sys_io_destroy 449 PTR sys_io_destroy
450 PTR sys_io_getevents 450 PTR compat_sys_io_getevents
451 PTR sys_io_submit 451 PTR compat_sys_io_submit
452 PTR sys_io_cancel /* 4245 */ 452 PTR sys_io_cancel /* 4245 */
453 PTR sys_exit_group 453 PTR sys_exit_group
454 PTR sys32_lookup_dcookie 454 PTR sys32_lookup_dcookie
diff --git a/drivers/serial/ioc3_serial.c b/drivers/serial/ioc3_serial.c
index 93de907b1208..800c54602339 100644
--- a/drivers/serial/ioc3_serial.c
+++ b/drivers/serial/ioc3_serial.c
@@ -2044,6 +2044,7 @@ ioc3uart_probe(struct ioc3_submodule *is, struct ioc3_driver_data *idd)
2044 if (!port) { 2044 if (!port) {
2045 printk(KERN_WARNING 2045 printk(KERN_WARNING
2046 "IOC3 serial memory not available for port\n"); 2046 "IOC3 serial memory not available for port\n");
2047 ret = -ENOMEM;
2047 goto out4; 2048 goto out4;
2048 } 2049 }
2049 spin_lock_init(&port->ip_lock); 2050 spin_lock_init(&port->ip_lock);