8 files changed, 10 insertions, 12 deletions

diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index bb133d10b145..ebc0cd20b35d 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -71,7 +71,6 @@ void r4k_wait_irqoff(void)
         local_irq_enable();
         __asm__("       .globl __pastwait       \n"
                 "__pastwait:                    \n");
-        return;
 }
 
 /*
diff --git a/arch/mips/kernel/irq_cpu.c b/arch/mips/kernel/irq_cpu.c
index 6e71b284f6c9..191eb52228c4 100644
--- a/arch/mips/kernel/irq_cpu.c
+++ b/arch/mips/kernel/irq_cpu.c
@@ -103,14 +103,12 @@ void __init mips_cpu_irq_init(void)
         clear_c0_status(ST0_IM);
         clear_c0_cause(CAUSEF_IP);
 
-        /*
-         * Only MT is using the software interrupts currently, so we just
-         * leave them uninitialized for other processors.
-         */
-        if (cpu_has_mipsmt)
-                for (i = irq_base; i < irq_base + 2; i++)
-                        irq_set_chip_and_handler(i, &mips_mt_cpu_irq_controller,
-                                                 handle_percpu_irq);
+        /* Software interrupts are used for MT/CMT IPI */
+        for (i = irq_base; i < irq_base + 2; i++)
+                irq_set_chip_and_handler(i, cpu_has_mipsmt ?
+                                         &mips_mt_cpu_irq_controller :
+                                         &mips_cpu_irq_controller,
+                                         handle_percpu_irq);
 
         for (i = irq_base + 2; i < irq_base + 8; i++)
                 irq_set_chip_and_handler(i, &mips_cpu_irq_controller,
diff --git a/arch/mips/kernel/perf_event.c b/arch/mips/kernel/perf_event.c
index d0deaab9ace2..0aee944ac380 100644
--- a/arch/mips/kernel/perf_event.c
+++ b/arch/mips/kernel/perf_event.c
@@ -192,8 +192,6 @@ again:
 
         local64_add(delta, &event->count);
         local64_sub(delta, &hwc->period_left);
-
-        return;
 }
 
 static void mipspmu_start(struct perf_event *event, int flags)
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index c28fbe6107bc..b30cb2573aaf 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -103,7 +103,6 @@ void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long sp)
                 __init_dsp();
         regs->cp0_epc = pc;
         regs->regs[29] = sp;
-        current_thread_info()->addr_limit = USER_DS;
 }
 
 void exit_thread(void)
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
index 99e656e425f3..e521420a45a5 100644
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@ -589,6 +589,7 @@ einval:	li	v0, -ENOSYS
         sys     sys_open_by_handle_at   3       /* 4340 */
         sys     sys_clock_adjtime       2
         sys     sys_syncfs              1
+        sys     sys_sendmmsg            4
         sys     sys_setns               2
         .endm
 
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
index fb0575f47f3d..85874d6a8a70 100644
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
@@ -428,5 +428,6 @@ sys_call_table:
         PTR     sys_open_by_handle_at
         PTR     sys_clock_adjtime               /* 5300 */
         PTR     sys_syncfs
+        PTR     sys_sendmmsg
         PTR     sys_setns
         .size   sys_call_table,.-sys_call_table
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 4de0c5534e73..b85842fc87ae 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -428,5 +428,6 @@ EXPORT(sysn32_call_table)
         PTR     sys_open_by_handle_at
         PTR     compat_sys_clock_adjtime        /* 6305 */
         PTR     sys_syncfs
+        PTR     compat_sys_sendmmsg
         PTR     sys_setns
         .size   sysn32_call_table,.-sysn32_call_table
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index 4a387de08bfa..46c4763edf21 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -546,5 +546,6 @@ sys_call_table:
         PTR     compat_sys_open_by_handle_at    /* 4340 */
         PTR     compat_sys_clock_adjtime
         PTR     sys_syncfs
+        PTR     compat_sys_sendmmsg
         PTR     sys_setns
         .size   sys_call_table,.-sys_call_table