diff --git a/[refs] b/[refs]
index 88d9c2e5d323..480ebca4b42f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65603789db56b915dd5e3ea0501a7773ecf4092d
+refs/heads/master: 307646c958f0f3c3624368eaa72dce8567b25f93
diff --git a/trunk/arch/sh/kernel/ptrace_32.c b/trunk/arch/sh/kernel/ptrace_32.c
index c198eceaee94..f4f58e438a26 100644
--- a/trunk/arch/sh/kernel/ptrace_32.c
+++ b/trunk/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))