diff options
| author | Zhaolei <zhaolei@cn.fujitsu.com> | 2009-03-13 17:16:34 +0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 10:25:06 +0100 |
| commit | fa9d13cf135efbd454453a53b6299976bea245a9 (patch) | |
| tree | 240d46a90984f3c84f336535269e97559e891104 /kernel | |
| parent | b00f0b6dc1773b4c8f538503247da050b5ea631b (diff) | |
| download | blackbird-op-linux-fa9d13cf135efbd454453a53b6299976bea245a9.tar.gz blackbird-op-linux-fa9d13cf135efbd454453a53b6299976bea245a9.zip | |
ftrace: don't try to __ftrace_replace_code on !FTRACE_FL_CONVERTED rec
Do __ftrace_replace_code for !FTRACE_FL_CONVERTED rec will always
fail, we should ignore this rec.
Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Cc: "Steven Rostedt ;" <rostedt@goodmis.org>
LKML-Reference: <49BA2472.4060206@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/ftrace.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 26c45aaf6805..08f4a624e31f 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -532,11 +532,12 @@ static void ftrace_replace_code(int enable) do_for_each_ftrace_rec(pg, rec) { /* - * Skip over free records and records that have - * failed. + * Skip over free records, records that have + * failed and not converted. */ if (rec->flags & FTRACE_FL_FREE || - rec->flags & FTRACE_FL_FAILED) + rec->flags & FTRACE_FL_FAILED || + rec->flags & FTRACE_FL_CONVERTED) continue; /* ignore updates to this record's mcount site */ @@ -548,7 +549,7 @@ static void ftrace_replace_code(int enable) } failed = __ftrace_replace_code(rec, enable); - if (failed && (rec->flags & FTRACE_FL_CONVERTED)) { + if (failed) { rec->flags |= FTRACE_FL_FAILED; if ((system_state == SYSTEM_BOOTING) || !core_kernel_text(rec->ip)) { |
