diff --git a/[refs] b/[refs]
index 7c6e9ba3ea1f..8309beaf8171 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07868b086cca784f4b532fc2ab574ec3a73b468a
+refs/heads/master: 5e5bf483986ad86ad25f25eec5299c86eb2d1c57
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 38a4a3ee749d..b6211d604131 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -89,7 +89,7 @@ static int dummy_set_flag(u32 old_flags, u32 bit, int set)
  */
 static int tracing_disabled = 1;
 
-static DEFINE_PER_CPU(local_t, ftrace_cpu_disabled);
+DEFINE_PER_CPU(local_t, ftrace_cpu_disabled);
 
 static inline void ftrace_disable_cpu(void)
 {
diff --git a/trunk/kernel/trace/trace.h b/trunk/kernel/trace/trace.h
index 758b0dbed552..c7e92732982d 100644
--- a/trunk/kernel/trace/trace.h
+++ b/trunk/kernel/trace/trace.h
@@ -519,6 +519,7 @@ extern int DYN_FTRACE_TEST_NAME(void);
 
 extern int ring_buffer_expanded;
 extern bool tracing_selftest_disabled;
+DECLARE_PER_CPU(local_t, ftrace_cpu_disabled);
 
 #ifdef CONFIG_FTRACE_STARTUP_TEST
 extern int trace_selftest_startup_function(struct tracer *trace,