git » linux-kernel » commit 3279ba3

ftrace: check for failure for all conversions

author Steven Rostedt
2009-10-07 20:57:56 UTC
committer Steven Rostedt
2009-10-07 21:22:24 UTC
parent e7247a15ff3bbdab0a8b402dffa1171e5c05a8e0
ftrace: check for failure for all conversions

Due to legacy code from back when the dynamic tracer used a daemon,
only core kernel code was checking for failures. This is no longer
the case. We must check for failures any time we perform text modifications.

Cc: stable@kernel.org
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
kernel/trace/ftrace.c +3 -8 
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index c701476a648..f136fe5da07 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1074,14 +1074,9 @@ static void ftrace_replace_code(int enable)
 		failed = __ftrace_replace_code(rec, enable);
 		if (failed) {
 			rec->flags |= FTRACE_FL_FAILED;
-			if ((system_state == SYSTEM_BOOTING) ||
-			    !core_kernel_text(rec->ip)) {
-				ftrace_free_rec(rec);
-				} else {
-				ftrace_bug(failed, rec->ip);
-					/* Stop processing */
-					return;
-				}
+			ftrace_bug(failed, rec->ip);
+			/* Stop processing */
+			return;
 		}
 	} while_for_each_ftrace_rec();
 }