From 26721a2a8595bbbe940b16a6192b4625fc587ede Mon Sep 17 00:00:00 2001
From: Abhishek Sagar <sagar.abhishek@gmail.com>
Date: Sun, 25 May 2008 00:10:04 +0530
Subject: [PATCH] --- yaml --- r: 100563 b: refs/heads/master c:
 492a7ea5bcf263ee02a9eb6a3ab0222a1946fade h: refs/heads/master i:   100561:
 27b2013ab665258cb11db56ffd4fc693671afc36   100559:
 a2cba0c5d03c8c42d1c50f4b37000838683acca6 v: v3

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

diff --git a/[refs] b/[refs]
index 27333f79e46a..718f57181eec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffdaa3582b6b39d625d585d07e329ffdc925e971
+refs/heads/master: 492a7ea5bcf263ee02a9eb6a3ab0222a1946fade
diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
index 9b7c54f8a62f..1843edc098a6 100644
--- a/trunk/kernel/trace/ftrace.c
+++ b/trunk/kernel/trace/ftrace.c
@@ -453,7 +453,7 @@ static void ftrace_shutdown_replenish(void)
 	ftrace_pages->next = (void *)get_zeroed_page(GFP_KERNEL);
 }
 
-static void
+static int
 ftrace_code_disable(struct dyn_ftrace *rec)
 {
 	unsigned long ip;
@@ -469,7 +469,9 @@ ftrace_code_disable(struct dyn_ftrace *rec)
 	if (failed) {
 		rec->flags |= FTRACE_FL_FAILED;
 		ftrace_free_rec(rec);
+		return 0;
 	}
+	return 1;
 }
 
 static int __ftrace_modify_code(void *data)
@@ -617,8 +619,8 @@ static int __ftrace_update_code(void *ignore)
 
 		/* all CPUS are stopped, we are safe to modify code */
 		hlist_for_each_entry(p, t, &head, node) {
-			ftrace_code_disable(p);
-			ftrace_update_cnt++;
+			if (ftrace_code_disable(p))
+				ftrace_update_cnt++;
 		}
 
 	}