Browse Source

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>
Paul Mundt 16 years ago
parent
commit
307646c958
1 changed files with 4 additions and 0 deletions
  1. 4 0
      arch/sh/kernel/ptrace_32.c

+ 4 - 0
arch/sh/kernel/ptrace_32.c

@@ -461,8 +461,10 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
 		 */
 		 */
 		ret = -1L;
 		ret = -1L;
 
 
+#ifdef CONFIG_FTRACE_SYSCALLS
 	if (unlikely(test_thread_flag(TIF_SYSCALL_FTRACE)))
 	if (unlikely(test_thread_flag(TIF_SYSCALL_FTRACE)))
 		ftrace_syscall_enter(regs);
 		ftrace_syscall_enter(regs);
+#endif
 
 
 	if (unlikely(current->audit_context))
 	if (unlikely(current->audit_context))
 		audit_syscall_entry(audit_arch(), regs->regs[3],
 		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]),
 		audit_syscall_exit(AUDITSC_RESULT(regs->regs[0]),
 				   regs->regs[0]);
 				   regs->regs[0]);
 
 
+#ifdef CONFIG_FTRACE_SYSCALLS
 	if (unlikely(test_thread_flag(TIF_SYSCALL_FTRACE)))
 	if (unlikely(test_thread_flag(TIF_SYSCALL_FTRACE)))
 		ftrace_syscall_exit(regs);
 		ftrace_syscall_exit(regs);
+#endif
 
 
 	step = test_thread_flag(TIF_SINGLESTEP);
 	step = test_thread_flag(TIF_SINGLESTEP);
 	if (step || test_thread_flag(TIF_SYSCALL_TRACE))
 	if (step || test_thread_flag(TIF_SYSCALL_TRACE))