diff options
-rw-r--r-- | kernel/trace/ftrace.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index c9e09d86e1d8..7694f3e59797 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c | |||
@@ -37,14 +37,6 @@ int ftrace_enabled __read_mostly; | |||
37 | static int last_ftrace_enabled; | 37 | static int last_ftrace_enabled; |
38 | 38 | ||
39 | /* | 39 | /* |
40 | * Since MCOUNT_ADDR may point to mcount itself, we do not want | ||
41 | * to get it confused by reading a reference in the code as we | ||
42 | * are parsing on objcopy output of text. Use a variable for | ||
43 | * it instead. | ||
44 | */ | ||
45 | static unsigned long mcount_addr = MCOUNT_ADDR; | ||
46 | |||
47 | /* | ||
48 | * ftrace_disabled is set when an anomaly is discovered. | 40 | * ftrace_disabled is set when an anomaly is discovered. |
49 | * ftrace_disabled is much stronger than ftrace_enabled. | 41 | * ftrace_disabled is much stronger than ftrace_enabled. |
50 | */ | 42 | */ |
@@ -178,6 +170,14 @@ static DEFINE_SPINLOCK(ftrace_hash_lock); | |||
178 | #define ftrace_hash_unlock(flags) do { } while(0) | 170 | #define ftrace_hash_unlock(flags) do { } while(0) |
179 | #endif | 171 | #endif |
180 | 172 | ||
173 | /* | ||
174 | * Since MCOUNT_ADDR may point to mcount itself, we do not want | ||
175 | * to get it confused by reading a reference in the code as we | ||
176 | * are parsing on objcopy output of text. Use a variable for | ||
177 | * it instead. | ||
178 | */ | ||
179 | static unsigned long mcount_addr = MCOUNT_ADDR; | ||
180 | |||
181 | static struct task_struct *ftraced_task; | 181 | static struct task_struct *ftraced_task; |
182 | 182 | ||
183 | enum { | 183 | enum { |