lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Zhaolei
2009-03-13 17:16:34 +08:00
committed by Ingo Molnar
parent b00f0b6dc1
commit fa9d13cf13
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/trace/ftrace.c
View File

@@ -532,11 +532,12 @@ static void ftrace_replace_code(int enable)
do_for_each_ftrace_rec(pg, rec) { do_for_each_ftrace_rec(pg, rec) {
/* /*
* Skip over free records and records that have * Skip over free records, records that have
* failed. * failed and not converted.
*/ */
if (rec->flags & FTRACE_FL_FREE || if (rec->flags & FTRACE_FL_FREE ||
rec->flags & FTRACE_FL_FAILED) rec->flags & FTRACE_FL_FAILED ||
rec->flags & FTRACE_FL_CONVERTED)
continue; continue;
/* ignore updates to this record's mcount site */ /* 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); failed = __ftrace_replace_code(rec, enable);
if (failed && (rec->flags & FTRACE_FL_CONVERTED)) { if (failed) {
rec->flags |= FTRACE_FL_FAILED; rec->flags |= FTRACE_FL_FAILED;
if ((system_state == SYSTEM_BOOTING) || if ((system_state == SYSTEM_BOOTING) ||
!core_kernel_text(rec->ip)) { !core_kernel_text(rec->ip)) {