diff --git a/[refs] b/[refs]
index 8c42b9c00a5f..4103f3e6b622 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b928c23fa3e9fa37d1d4ba52ba963f41ee5aae0
+refs/heads/master: c5131ad6c3cbe8f6674993e29a76cecf8deb4384
diff --git a/trunk/include/linux/ftrace.h b/trunk/include/linux/ftrace.h
index ce929cb55435..36c439927ff1 100644
--- a/trunk/include/linux/ftrace.h
+++ b/trunk/include/linux/ftrace.h
@@ -36,6 +36,7 @@ extern void ftrace_stub(unsigned long a0, unsigned long a1);
 # define register_ftrace_function(ops) do { } while (0)
 # define unregister_ftrace_function(ops) do { } while (0)
 # define clear_ftrace_function(ops) do { } while (0)
+static inline void ftrace_kill_atomic(void) { }
 #endif /* CONFIG_FTRACE */
 
 #ifdef CONFIG_DYNAMIC_FTRACE