From 41945c17f206e42010c6487d3e9fe8ca5ac5757f Mon Sep 17 00:00:00 2001
From: Zhaolei <zhaolei@cn.fujitsu.com>
Date: Fri, 13 Mar 2009 17:14:01 +0800
Subject: [PATCH] --- yaml --- r: 140951 b: refs/heads/master c:
 b00f0b6dc1773b4c8f538503247da050b5ea631b h: refs/heads/master i:   140949:
 f5d67f424940e7586300997f2bd77efc7cfd8d71   140947:
 24fd7410866af01595a33a18dd681227ed4ce0f9   140943:
 9dd465691df068a06ec072f3af7157f2c3e7c399 v: v3

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

diff --git a/[refs] b/[refs]
index 8cd613e72017..9dbb4d4a292b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62a394eb77a1ddea73273f53ed8c3ccf6e04f2fb
+refs/heads/master: b00f0b6dc1773b4c8f538503247da050b5ea631b
diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
index d33d306bdcf4..26c45aaf6805 100644
--- a/trunk/kernel/trace/ftrace.c
+++ b/trunk/kernel/trace/ftrace.c
@@ -356,7 +356,8 @@ void ftrace_release(void *start, unsigned long size)
 
 	mutex_lock(&ftrace_lock);
 	do_for_each_ftrace_rec(pg, rec) {
-		if ((rec->ip >= s) && (rec->ip < e))
+		if ((rec->ip >= s) && (rec->ip < e) &&
+		    !(rec->flags & FTRACE_FL_FREE))
 			ftrace_free_rec(rec);
 	} while_for_each_ftrace_rec();
 	mutex_unlock(&ftrace_lock);