sh: Fix up the CONFIG_FTRACE_SYSCALLS=n build.

-tip can't be bothered keeping interfaces stable long enough for anyone
to use them without having their builds broken without notification, so
just ifdef around the problematic symbols until the new interfaces become
available upstream.

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

diff --git a/arch/sh/kernel/ptrace_32.c b/arch/sh/kernel/ptrace_32.c
index c198eceaee94dbef536ee9e0db32a2a002abfea6..f4f58e438a2623de5d0191e327ed8cfd34b1435f 100644 (file)
--- a/arch/sh/kernel/ptrace_32.c
+++ b/arch/sh/kernel/ptrace_32.c
@@ -461,8 +461,10 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
                 */
                ret = -1L;
 
+#ifdef CONFIG_FTRACE_SYSCALLS
        if (unlikely(test_thread_flag(TIF_SYSCALL_FTRACE)))
                ftrace_syscall_enter(regs);
+#endif
 
        if (unlikely(current->audit_context))
                audit_syscall_entry(audit_arch(), regs->regs[3],
@@ -480,8 +482,10 @@ asmlinkage void do_syscall_trace_leave(struct pt_regs *regs)
                audit_syscall_exit(AUDITSC_RESULT(regs->regs[0]),
                                   regs->regs[0]);
 
+#ifdef CONFIG_FTRACE_SYSCALLS
        if (unlikely(test_thread_flag(TIF_SYSCALL_FTRACE)))
                ftrace_syscall_exit(regs);
+#endif
 
        step = test_thread_flag(TIF_SINGLESTEP);
        if (step || test_thread_flag(TIF_SYSCALL_TRACE))