diff --git a/[refs] b/[refs]
index d1af25932bd0..b9fa231d684b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19007a67a64f9b3cbbd7024f972654ebf14daade
+refs/heads/master: 60d970c254b95ec7a0fc4c590b510253987b64a0
diff --git a/trunk/kernel/tracepoint.c b/trunk/kernel/tracepoint.c
index 070a42bb8920..35dd27adb82c 100644
--- a/trunk/kernel/tracepoint.c
+++ b/trunk/kernel/tracepoint.c
@@ -579,6 +579,8 @@ __initcall(init_tracepoints);
 
 #endif /* CONFIG_MODULES */
 
+#ifdef CONFIG_FTRACE_SYSCALLS
+
 static DEFINE_MUTEX(regfunc_mutex);
 static int sys_tracepoint_refcount;
 
@@ -615,3 +617,4 @@ void syscall_unregfunc(void)
 	}
 	mutex_unlock(&regfunc_mutex);
 }
+#endif