Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8275f69f authored by Mathias Krause's avatar Mathias Krause Committed by Steven Rostedt
Browse files

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: default avatarMathias Krause <minipli@googlemail.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 74bb8c45

kernel/trace/ftrace.c

+4 −2
Original line number Diff line number Diff line
@@ -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++;