diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/ftrace.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 083c6d5fce25..5bd70e8b09b0 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c | |||
| @@ -4372,14 +4372,11 @@ void __init ftrace_init(void) | |||
| 4372 | { | 4372 | { |
| 4373 | extern unsigned long __start_mcount_loc[]; | 4373 | extern unsigned long __start_mcount_loc[]; |
| 4374 | extern unsigned long __stop_mcount_loc[]; | 4374 | extern unsigned long __stop_mcount_loc[]; |
| 4375 | unsigned long count, addr, flags; | 4375 | unsigned long count, flags; |
| 4376 | int ret; | 4376 | int ret; |
| 4377 | 4377 | ||
| 4378 | /* Keep the ftrace pointer to the stub */ | ||
| 4379 | addr = (unsigned long)ftrace_stub; | ||
| 4380 | |||
| 4381 | local_irq_save(flags); | 4378 | local_irq_save(flags); |
| 4382 | ret = ftrace_dyn_arch_init(&addr); | 4379 | ret = ftrace_dyn_arch_init(); |
| 4383 | local_irq_restore(flags); | 4380 | local_irq_restore(flags); |
| 4384 | if (ret) | 4381 | if (ret) |
| 4385 | goto failed; | 4382 | goto failed; |
