From: Steven Rostedt <srostedt@redhat.com>
Date: Wed, 7 Oct 2009 20:57:56 +0000 (-0400)
Subject: ftrace: check for failure for all conversions
X-Git-Tag: v2.6.32-rc4~27^2~2
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=3279ba37db5d65c4ab0dcdee3b211ccb85bb563f;hp=e7247a15ff3bbdab0a8b402dffa1171e5c05a8e0;p=net-next-2.6.git

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>
---

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();
 }