From 42611b6fd79a1b940eb1337bd6e44893125a394c Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 24 Oct 2008 12:47:10 +0200
Subject: [PATCH] --- yaml --- r: 118009 b: refs/heads/master c:
 f17845e5d97ead8fbdadfd40039e058ec7cf4a42 h: refs/heads/master i:   118007:
 e1865e898171f47862d22de0e38981b68ff8f2be v: v3

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

diff --git a/[refs] b/[refs]
index 69d86f16c790..bf8d809cc12a 100644
--- 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
index 27212321eb0d..7618c528756b 100644
--- 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;
 }
+