diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2009-03-16 17:41:00 -0400 |
|---|---|---|
| committer | Steven Rostedt <srostedt@redhat.com> | 2009-03-16 22:15:36 -0400 |
| commit | 03303549b1695dc024d4a653cc16bd79f78f9750 (patch) | |
| tree | aa731b33460908038a50fb72850b873638a768aa | |
| parent | b478b782e110fdb4135caa3062b6d687e989d994 (diff) | |
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:
fa9d13cf135efbd454453a53b6299976bea245a9
(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>
| -rw-r--r-- | kernel/trace/ftrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 90d5729afeff..7847806eefef 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c | |||
| @@ -537,7 +537,7 @@ static void ftrace_replace_code(int enable) | |||
| 537 | */ | 537 | */ |
| 538 | if (rec->flags & FTRACE_FL_FREE || | 538 | if (rec->flags & FTRACE_FL_FREE || |
| 539 | rec->flags & FTRACE_FL_FAILED || | 539 | rec->flags & FTRACE_FL_FAILED || |
| 540 | rec->flags & FTRACE_FL_CONVERTED) | 540 | !(rec->flags & FTRACE_FL_CONVERTED)) |
| 541 | continue; | 541 | continue; |
| 542 | 542 | ||
| 543 | /* ignore updates to this record's mcount site */ | 543 | /* ignore updates to this record's mcount site */ |