summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Noonan <steven@uplinklabs.net>2008-09-20 01:00:37 -0700
committerIngo Molnar <mingo@elte.hu>2008-10-14 10:37:58 +0200
commit71c67d58b5660f8e42c7d4c3e77cbc03fac5ed31 (patch)
treec098b6b717c3bf1cb80bef83bde7c9a0ccbacaad
parentfb1b6d8b5154c692172a424e45fbd0573295cb93 (diff)
downloadlinux-stable-71c67d58b5660f8e42c7d4c3e77cbc03fac5ed31.tar.gz
linux-stable-71c67d58b5660f8e42c7d4c3e77cbc03fac5ed31.tar.bz2
linux-stable-71c67d58b5660f8e42c7d4c3e77cbc03fac5ed31.zip
ftrace: mcount_addr defined but not used
When CONFIG_DYNAMIC_FTRACE isn't used, neither is mcount_addr. This patch eliminates that warning. Signed-off-by: Steven Noonan <steven@uplinklabs.net> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--kernel/trace/ftrace.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index c9e09d86e1d8..7694f3e59797 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -37,14 +37,6 @@ int ftrace_enabled __read_mostly;
static int last_ftrace_enabled;
/*
- * Since MCOUNT_ADDR may point to mcount itself, we do not want
- * to get it confused by reading a reference in the code as we
- * are parsing on objcopy output of text. Use a variable for
- * it instead.
- */
-static unsigned long mcount_addr = MCOUNT_ADDR;
-
-/*
* ftrace_disabled is set when an anomaly is discovered.
* ftrace_disabled is much stronger than ftrace_enabled.
*/
@@ -178,6 +170,14 @@ static DEFINE_SPINLOCK(ftrace_hash_lock);
#define ftrace_hash_unlock(flags) do { } while(0)
#endif
+/*
+ * Since MCOUNT_ADDR may point to mcount itself, we do not want
+ * to get it confused by reading a reference in the code as we
+ * are parsing on objcopy output of text. Use a variable for
+ * it instead.
+ */
+static unsigned long mcount_addr = MCOUNT_ADDR;
+
static struct task_struct *ftraced_task;
enum {