---

yaml --- r: 140951 b: refs/heads/master c: b00f0b6 h: refs/heads/master i: 140949: f5d67f4 140947: 24fd741 140943: 9dd4656 v: v3
git-mirror · Mar 13, 2009 · 41945c1 · 41945c1
1 parent badbca4
commit 41945c1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);