diff options
Diffstat (limited to 'kernel/trace/ftrace.c')
-rw-r--r-- | kernel/trace/ftrace.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index ff42345dd78e..425b1fec3d83 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c | |||
@@ -197,8 +197,8 @@ static int ftrace_record_suspend; | |||
197 | 197 | ||
198 | static struct dyn_ftrace *ftrace_free_records; | 198 | static struct dyn_ftrace *ftrace_free_records; |
199 | 199 | ||
200 | static inline int | 200 | static inline int notrace |
201 | notrace ftrace_ip_in_hash(unsigned long ip, unsigned long key) | 201 | ftrace_ip_in_hash(unsigned long ip, unsigned long key) |
202 | { | 202 | { |
203 | struct dyn_ftrace *p; | 203 | struct dyn_ftrace *p; |
204 | struct hlist_node *t; | 204 | struct hlist_node *t; |
@@ -1249,6 +1249,7 @@ static int __init notrace ftrace_dynamic_init(void) | |||
1249 | int ret; | 1249 | int ret; |
1250 | 1250 | ||
1251 | addr = (unsigned long)ftrace_record_ip; | 1251 | addr = (unsigned long)ftrace_record_ip; |
1252 | |||
1252 | stop_machine_run(ftrace_dyn_arch_init, &addr, NR_CPUS); | 1253 | stop_machine_run(ftrace_dyn_arch_init, &addr, NR_CPUS); |
1253 | 1254 | ||
1254 | /* ftrace_dyn_arch_init places the return code in addr */ | 1255 | /* ftrace_dyn_arch_init places the return code in addr */ |