1 files changed, 7 insertions, 14 deletions

diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index f543ff4feef9..6369cfd390c6 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -87,6 +87,7 @@ loads_done:
         and     t0, t1, t0
         bnez    t0, trace_a_syscall
 
+syscall_common:
         jalr    t2                      # Do The Real Thing (TM)
 
         li      t0, -EMAXERRNO - 1      # error?
@@ -130,9 +131,9 @@ trace_a_syscall:
 
 1:      jal     syscall_trace_enter
 
-        bltz    v0, 2f                  # seccomp failed? Skip syscall
+        bltz    v0, 1f                  # seccomp failed? Skip syscall
 
-        move    t0, s0
+        move    t2, s0
         RESTORE_STATIC
         ld      a0, PT_R4(sp)           # Restore argument registers
         ld      a1, PT_R5(sp)
@@ -142,19 +143,9 @@ trace_a_syscall:
         ld      a5, PT_R9(sp)
         ld      a6, PT_R10(sp)
         ld      a7, PT_R11(sp)          # For indirect syscalls
-        jalr    t0
+        j       syscall_common
 
-        li      t0, -EMAXERRNO - 1      # error?
-        sltu    t0, t0, v0
-        sd      t0, PT_R7(sp)           # set error flag
-        beqz    t0, 1f
-
-        ld      t1, PT_R2(sp)           # syscall number
-        dnegu   v0                      # error
-        sd      t1, PT_R0(sp)           # save it for syscall restarting
-1:      sd      v0, PT_R2(sp)           # result
-
-2:      j       syscall_exit
+1:      j       syscall_exit
 
 /* ------------------------------------------------------------------------ */
 
@@ -584,4 +575,6 @@ EXPORT(sys32_call_table)
         PTR     sys_memfd_create
         PTR     sys_bpf                         /* 4355 */
         PTR     compat_sys_execveat
+        PTR     sys_userfaultfd
+        PTR     sys_membarrier
         .size   sys32_call_table,.-sys32_call_table