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

Commit 5767cfea authored Jul 03, 2012 by Steven Rostedt Committed by Steven Rostedt Jul 31, 2012

ftrace/x86: Remove function_trace_stop check from graph caller

The graph caller is called by the mcount callers, which already does
the check against the function_trace_stop variable. No reason to
check it again.

Link: http://lkml.kernel.org/r/20120711195745.588538769@goodmis.org



Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

parent e4ea3f6b

arch/x86/kernel/entry_32.S

+0 −3

Original line number	Diff line number	Diff line
		@@ -1241,9 +1241,6 @@ END(mcount)

		#ifdef CONFIG_FUNCTION_GRAPH_TRACER
		ENTRY(ftrace_graph_caller)
		cmpl $0, function_trace_stop
		jne ftrace_stub

		pushl %eax
		pushl %ecx
		pushl %edx

arch/x86/kernel/entry_64.S

+0 −3

Original line number	Diff line number	Diff line
		@@ -213,9 +213,6 @@ END(mcount)

		#ifdef CONFIG_FUNCTION_GRAPH_TRACER
		ENTRY(ftrace_graph_caller)
		cmpl $0, function_trace_stop
		jne ftrace_stub

		MCOUNT_SAVE_FRAME

		leaq 8(%rbp), %rdi