Commit 03303549 authored Mar 16, 2009 by Frederic Weisbecker Committed by Steven Rostedt Mar 16, 2009

tracing/ftrace: fix the check on nopped sites



Impact: fix a dynamic tracing failure

Recently, the function and function graph tracers failed to use dynamic
tracing after the following commit:

fa9d13cf
(ftrace: don't try to __ftrace_replace_code on !FTRACE_FL_CONVERTED rec)

The patch is right except a mistake on the check for the FTRACE_FL_CONVERTED
flag. The code patching is aborted in case of successfully nopped sites.
What we want is the opposite: ignore the callsites that haven't been nopped.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Steven Rostedt <srostedt@redhat.com>

parent b478b782

kernel/trace/ftrace.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -537,7 +537,7 @@ static void ftrace_replace_code(int enable)
		*/
		if (rec->flags & FTRACE_FL_FREE \|\|
		rec->flags & FTRACE_FL_FAILED \|\|
		rec->flags & FTRACE_FL_CONVERTED)
		!(rec->flags & FTRACE_FL_CONVERTED))
		continue;

		/* ignore updates to this record's mcount site */

Admin message