From 94dd81d8b609c66f826b2d708e0a2c0d556f32e4 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Thu, 19 Feb 2009 13:41:27 -0500
Subject: [PATCH] --- yaml --- r: 140786 b: refs/heads/master c:
 4377245aa93b65b6597e4b7bb460fb9abc48b56b h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/kernel/trace/ftrace.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d490c6396b82..0f48be2db223 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90c7ac49aa819feb9433b5310089fca6399881c0
+refs/heads/master: 4377245aa93b65b6597e4b7bb460fb9abc48b56b
diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
index 72316d9647bd..11ad796ca049 100644
--- a/trunk/kernel/trace/ftrace.c
+++ b/trunk/kernel/trace/ftrace.c
@@ -561,8 +561,11 @@ static void ftrace_replace_code(int enable)
 				if ((system_state == SYSTEM_BOOTING) ||
 				    !core_kernel_text(rec->ip)) {
 					ftrace_free_rec(rec);
-				} else
+				} else {
 					ftrace_bug(failed, rec->ip);
+					/* Stop processing */
+					return;
+				}
 			}
 		}
 	}