Merge branch 'dummy-ctl-inactive' of git://git.alsa-project.org/alsa-kprivate into...

[firefly-linux-kernel-4.4.55.git] / arch / mips / kernel / scall64-64.S

diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
index 3b5a5e9ae49c132640c95a87037e48ac95e5b932..169de6a6d916549ae3e5e5cb079a022314718cbe 100644 (file)
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
@@ -72,18 +72,7 @@ NESTED(handle_sys64, PT_SIZE, sp)
 1:     sd      v0, PT_R2(sp)           # result
 
 n64_syscall_exit:
-       local_irq_disable               # make sure need_resched and
-                                       # signals dont change between
-                                       # sampling and return
-       LONG_L  a2, TI_FLAGS($28)       # current->work
-       li      t0, _TIF_ALLWORK_MASK
-       and     t0, a2, t0
-       bnez    t0, n64_syscall_exit_work
-
-       j       restore_partial
-
-n64_syscall_exit_work:
-       j       syscall_exit_work_partial
+       j       syscall_exit_partial
 
 /* ------------------------------------------------------------------------ */
 
@@ -432,4 +421,5 @@ sys_call_table:
        PTR     sys_setns
        PTR     sys_process_vm_readv
        PTR     sys_process_vm_writev           /* 5305 */
+       PTR     sys_kcmp
        .size   sys_call_table,.-sys_call_table