sh: Make syscall tracer use tracehook notifiers, add TIF_NOTIFY_RESUME.

This follows the changes in commits:

7d6d637dac2050f30a1b57b0a3dc5de4a10616ba
4f72c4279eab1e5f3ed1ac4e55d4527617582392

on powerpc. Adding in TIF_NOTIFY_RESUME, and cleaning up the syscall
tracing to be more generic. This is an incremental step to turning
on tracehook, as well as unifying more of the ptrace and signal code
across the 32/64 split.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 9 insertions, 8 deletions

diff --git a/arch/sh/kernel/cpu/sh5/entry.S b/arch/sh/kernel/cpu/sh5/entry.S
index bba331d5ef74..04c7da968146 100644
--- a/arch/sh/kernel/cpu/sh5/entry.S
+++ b/arch/sh/kernel/cpu/sh5/entry.S
@@ -987,11 +987,11 @@ work_resched:
 work_notifysig:
         gettr   tr1, LINK
 
-        movi    do_signal, r6
+        movi    do_notify_resume, r6
         ptabs   r6, tr0
         or      SP, ZERO, r2
-        or      ZERO, ZERO, r3
-        blink   tr0, LINK           /* Call do_signal(regs, 0), return here */
+        or      r7, ZERO, r3
+        blink   tr0, LINK           /* Call do_notify_resume(regs, current_thread_info->flags), return here */
 
 restore_all:
         /* Do prefetches */
@@ -1305,13 +1305,15 @@ syscall_allowed:
         beq/l   r6, ZERO, tr0
 
         /* Trace it by calling syscall_trace before and after */
-        movi    syscall_trace, r4
+        movi    do_syscall_trace_enter, r4
         or      SP, ZERO, r2
-        or      ZERO, ZERO, r3
         ptabs   r4, tr0
         blink   tr0, LINK
 
-        /* Reload syscall number as r5 is trashed by syscall_trace */
+        /* Save the retval */
+        st.q    SP, FRAME_R(2), r2
+
+        /* Reload syscall number as r5 is trashed by do_syscall_trace_enter */
         ld.q    SP, FRAME_S(FSYSCALL_ID), r5
         andi    r5, 0x1ff, r5
 
@@ -1343,9 +1345,8 @@ syscall_ret_trace:
         /* We get back here only if under trace */
         st.q    SP, FRAME_R(9), r2      /* Save return value */
 
-        movi    syscall_trace, LINK
+        movi    do_syscall_trace_leave, LINK
         or      SP, ZERO, r2
-        movi    1, r3
         ptabs   LINK, tr0
         blink   tr0, LINK