From 46f0a4d22b356cc24bd096474405f7cccd0da169 Mon Sep 17 00:00:00 2001 From: Zhaolei Date: Wed, 25 Mar 2009 12:06:05 +0800 Subject: [PATCH] --- yaml --- r: 141041 b: refs/heads/master c: 2a4efa42450762cbfa5c5712aa4cc9f06924c9fd h: refs/heads/master i: 141039: 15d5f6ff368f3c0e991d76ec114a1f5e46b3e7a0 v: v3 --- [refs] | 2 +- trunk/kernel/trace/ftrace.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d7d61b22a0bb..ef0a60e7b1f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 759ee0915dd713361e72facb78b66600b5712d65 +refs/heads/master: 2a4efa42450762cbfa5c5712aa4cc9f06924c9fd diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c index 7b8722baf153..1752a63f37c0 100644 --- a/trunk/kernel/trace/ftrace.c +++ b/trunk/kernel/trace/ftrace.c @@ -358,9 +358,14 @@ 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) && - !(rec->flags & FTRACE_FL_FREE)) + if ((rec->ip >= s) && (rec->ip < e)) { + /* + * rec->ip is changed in ftrace_free_rec() + * It should not between s and e if record was freed. + */ + FTRACE_WARN_ON(rec->flags & FTRACE_FL_FREE); ftrace_free_rec(rec); + } } while_for_each_ftrace_rec(); mutex_unlock(&ftrace_lock); }