From 6968c5e1c0665fca1b50c48693c802a9b151ef4e Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 17 Feb 2009 11:48:18 +0100
Subject: [PATCH] --- yaml --- r: 140759 b: refs/heads/master c:
 73d3fd96e77745742f3750b7b19ee42204adc210 h: refs/heads/master i:   140757:
 3ddfc1508d9b75a62b6b8ff077cc8e16d4bc4910   140755:
 7a1b85e21945a6a2f48c2f4c497d9bbc0276cc6a   140751:
 07d53eccaf0939685eb86ee3af01b80e1f334b0b v: v3

---
 [refs]                      | 2 +-
 trunk/kernel/trace/ftrace.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0e1d71208dd6..e52f0b51454b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97d0bb8dcd8c2812e1927cdb51d7b1f9c98352b5
+refs/heads/master: 73d3fd96e77745742f3750b7b19ee42204adc210
diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
index 6533c1d20155..4e6c87ecf1bf 100644
--- a/trunk/kernel/trace/ftrace.c
+++ b/trunk/kernel/trace/ftrace.c
@@ -243,14 +243,16 @@ static void ftrace_update_pid_func(void)
 	mutex_unlock(&ftrace_lock);
 }
 
+/* set when tracing only a pid */
+struct pid *ftrace_pid_trace;
+static struct pid * const ftrace_swapper_pid = &init_struct_pid;
+
 #ifdef CONFIG_DYNAMIC_FTRACE
+
 #ifndef CONFIG_FTRACE_MCOUNT_RECORD
 # error Dynamic ftrace depends on MCOUNT_RECORD
 #endif
 
-/* set when tracing only a pid */
-struct pid *ftrace_pid_trace;
-static struct pid * const ftrace_swapper_pid = &init_struct_pid;
 static struct hlist_head ftrace_func_hash[FTRACE_FUNC_HASHSIZE] __read_mostly;
 
 struct ftrace_func_hook {