diff --git a/[refs] b/[refs]
index 17c672baa68e..a822434d587e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2577046740fe6d77864128c6187c11125c2449ea
+refs/heads/master: aeaee8a2c9cb4489f166ca0e39c568e8254faaa6
diff --git a/trunk/include/linux/ftrace.h b/trunk/include/linux/ftrace.h
index 4650a3160b7f..08fbef1744cc 100644
--- a/trunk/include/linux/ftrace.h
+++ b/trunk/include/linux/ftrace.h
@@ -58,9 +58,6 @@ struct dyn_ftrace {
 int ftrace_force_update(void);
 void ftrace_set_filter(unsigned char *buf, int len, int reset);
 
-/* totally disable ftrace - can not re-enable after this */
-void ftrace_kill(void);
-
 /* defined in arch */
 extern int ftrace_ip_converted(unsigned long ip);
 extern unsigned char *ftrace_nop_replace(void);
@@ -74,10 +71,13 @@ extern void ftrace_caller(void);
 extern void ftrace_call(void);
 extern void mcount_call(void);
 #else
-# define ftrace_force_update() ({ 0; })
-# define ftrace_set_filter(buf, len, reset) do { } while (0)
+# define ftrace_force_update()			({ 0; })
+# define ftrace_set_filter(buf, len, reset)	do { } while (0)
 #endif
 
+/* totally disable ftrace - can not re-enable after this */
+void ftrace_kill(void);
+
 static inline void tracer_disable(void)
 {
 #ifdef CONFIG_FTRACE