1 files changed, 7 insertions, 9 deletions

diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S
index 5e0dd1933847..0bc17def55a7 100644
--- a/arch/sh/kernel/entry-common.S
+++ b/arch/sh/kernel/entry-common.S
@@ -202,7 +202,7 @@ work_resched:
 syscall_exit_work:
         ! r0: current_thread_info->flags
         ! r8: current_thread_info
-        tst     #_TIF_SYSCALL_TRACE | _TIF_SINGLESTEP | _TIF_SYSCALL_AUDIT, r0
+        tst     #_TIF_WORK_SYSCALL_MASK, r0
         bt/s    work_pending
          tst    #_TIF_NEED_RESCHED, r0
 #ifdef CONFIG_TRACE_IRQFLAGS
@@ -211,10 +211,8 @@ syscall_exit_work:
          nop
 #endif
         sti
-        ! XXX setup arguments...
         mov     r15, r4
-        mov     #1, r5
-        mov.l   4f, r0                  ! do_syscall_trace
+        mov.l   8f, r0                  ! do_syscall_trace_leave
         jsr     @r0
          nop
         bra     resume_userspace
@@ -223,12 +221,11 @@ syscall_exit_work:
         .align  2
 syscall_trace_entry:
         !                       Yes it is traced.
-        ! XXX setup arguments...
         mov     r15, r4
-        mov     #0, r5
-        mov.l   4f, r11         ! Call do_syscall_trace which notifies
+        mov.l   7f, r11         ! Call do_syscall_trace_enter which notifies
         jsr     @r11            ! superior (will chomp R[0-7])
          nop
+        mov.l   r0, @(OFF_R0,r15)       ! Save return value
         !                       Reload R0-R4 from kernel stack, where the
         !                       parent may have modified them using
         !                       ptrace(POKEUSR).  (Note that R0-R2 are
@@ -351,7 +348,7 @@ ENTRY(system_call)
         !
         get_current_thread_info r8, r10
         mov.l   @(TI_FLAGS,r8), r8
-        mov     #(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT), r10
+        mov     #_TIF_WORK_SYSCALL_MASK, r10
         tst     r10, r8
         bf      syscall_trace_entry
         !
@@ -389,8 +386,9 @@ syscall_exit:
 #endif
 2:      .long   NR_syscalls
 3:      .long   sys_call_table
-4:      .long   do_syscall_trace
 #ifdef CONFIG_TRACE_IRQFLAGS
 5:      .long   trace_hardirqs_on
 6:      .long   trace_hardirqs_off
 #endif
+7:      .long   do_syscall_trace_enter
+8:      .long   do_syscall_trace_leave