---

yaml --- r: 118009 b: refs/heads/master c: f17845e h: refs/heads/master i: 118007: e1865e8 v: v3
git-mirror · Oct 24, 2008 · 42611b6 · 42611b6
1 parent fd0c887
commit 42611b6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66b0de3569b00f61978782b9f97aa4803dbec0fb
+refs/heads/master: f17845e5d97ead8fbdadfd40039e058ec7cf4a42
diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
@@ -186,7 +186,6 @@ enum {
 
 static int ftrace_filtered;
 static int tracing_on;
-static int frozen_record_count;
 
 static LIST_HEAD(ftrace_new_addrs);
 
@@ -211,6 +210,9 @@ static struct dyn_ftrace *ftrace_free_records;
 
 
 #ifdef CONFIG_KPROBES
+
+static int frozen_record_count;
+
 static inline void freeze_record(struct dyn_ftrace *rec)
 {
 	if (!(rec->flags & FTRACE_FL_FROZEN)) {
@@ -1443,3 +1445,4 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
 	mutex_unlock(&ftrace_sysctl_lock);
 	return ret;
 }
+