From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 24 Oct 2008 10:47:10 +0000 (+0200)
Subject: ftrace: warning in kernel/trace/ftrace.c
X-Git-Tag: v2.6.28-rc3~86^2~8
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f17845e5d97ead8fbdadfd40039e058ec7cf4a42;p=linux-2.6-omap-h63xx.git

ftrace: warning in kernel/trace/ftrace.c

this warning:

  kernel/trace/ftrace.c:189: warning: ‘frozen_record_count’ defined but not used

triggers because frozen_record_count is only used in the KCONFIG_MARKERS
case. Move the variable it there.

Alas, this frozen-record facility seems to have little use. The
frozen_record_count variable is not used by anything, nor the flags.

So this section might need a bit of dead-code-removal care as well.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 27212321eb0..7618c528756 100644
--- a/kernel/trace/ftrace.c
+++ b/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;
 }
+