diff options
| author | Mathias Krause | 2014-03-30 15:31:50 +0200 |
|---|---|---|
| committer | Steven Rostedt | 2014-04-21 20:00:46 +0200 |
| commit | 8275f69f076d8b1ecc6d93305451e5a8f7336d4e (patch) | |
| tree | 8df092728c1fc34f5d29f6fd77515bac3204c4e1 /kernel | |
| parent | ftrace/x86: Fix order of warning messages when ftrace modifies code (diff) | |
| download | kernel-qcow2-linux-8275f69f076d8b1ecc6d93305451e5a8f7336d4e.tar.gz kernel-qcow2-linux-8275f69f076d8b1ecc6d93305451e5a8f7336d4e.tar.xz kernel-qcow2-linux-8275f69f076d8b1ecc6d93305451e5a8f7336d4e.zip | |
ftrace: Statically initialize pm notifier block
Instead of initializing the pm notifier block in register_ftrace_graph(),
initialize it statically. This safes us some code.
Found in the PaX patch, written by the PaX Team.
Link: http://lkml.kernel.org/p/1396186310-3156-1-git-send-email-minipli@googlemail.com
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: PaX Team <pageexec@freemail.hu>
Signed-off-by: Mathias Krause <minipli@googlemail.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
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, #ifdef CONFIG_FUNCTION_GRAPH_TRACER static int ftrace_graph_active; -static struct notifier_block ftrace_suspend_notifier; int ftrace_graph_entry_stub(struct ftrace_graph_ent *trace) { @@ -5036,6 +5035,10 @@ static void update_function_graph_func(void) ftrace_graph_entry = ftrace_graph_entry_test; } +static struct notifier_block ftrace_suspend_notifier = { + .notifier_call = ftrace_suspend_notifier_call, +}; + int register_ftrace_graph(trace_func_graph_ret_t retfunc, trace_func_graph_ent_t entryfunc) { @@ -5049,7 +5052,6 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc, goto out; } - ftrace_suspend_notifier.notifier_call = ftrace_suspend_notifier_call; register_pm_notifier(&ftrace_suspend_notifier); ftrace_graph_active++; |