diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/ftrace.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 8f61ef70a297..846888ea2ba4 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c | |||
| @@ -4860,7 +4860,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write, | |||
| 4860 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER | 4860 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER |
| 4861 | 4861 | ||
| 4862 | static int ftrace_graph_active; | 4862 | static int ftrace_graph_active; |
| 4863 | static struct notifier_block ftrace_suspend_notifier; | ||
| 4864 | 4863 | ||
| 4865 | int ftrace_graph_entry_stub(struct ftrace_graph_ent *trace) | 4864 | int ftrace_graph_entry_stub(struct ftrace_graph_ent *trace) |
| 4866 | { | 4865 | { |
| @@ -5036,6 +5035,10 @@ static void update_function_graph_func(void) | |||
| 5036 | ftrace_graph_entry = ftrace_graph_entry_test; | 5035 | ftrace_graph_entry = ftrace_graph_entry_test; |
| 5037 | } | 5036 | } |
| 5038 | 5037 | ||
| 5038 | static struct notifier_block ftrace_suspend_notifier = { | ||
| 5039 | .notifier_call = ftrace_suspend_notifier_call, | ||
| 5040 | }; | ||
| 5041 | |||
| 5039 | int register_ftrace_graph(trace_func_graph_ret_t retfunc, | 5042 | int register_ftrace_graph(trace_func_graph_ret_t retfunc, |
| 5040 | trace_func_graph_ent_t entryfunc) | 5043 | trace_func_graph_ent_t entryfunc) |
| 5041 | { | 5044 | { |
| @@ -5049,7 +5052,6 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc, | |||
| 5049 | goto out; | 5052 | goto out; |
| 5050 | } | 5053 | } |
| 5051 | 5054 | ||
| 5052 | ftrace_suspend_notifier.notifier_call = ftrace_suspend_notifier_call; | ||
| 5053 | register_pm_notifier(&ftrace_suspend_notifier); | 5055 | register_pm_notifier(&ftrace_suspend_notifier); |
| 5054 | 5056 | ||
| 5055 | ftrace_graph_active++; | 5057 | ftrace_graph_active++; |
