From: Steven Rostedt <srostedt@redhat.com>
Date: Mon, 11 Jul 2011 14:12:59 +0000 (-0400)
Subject: ftrace: Fix warning when CONFIG_FUNCTION_TRACER is not defined
X-Git-Tag: MMI-PSA29.97-13-9~18912^2~11^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=04da85b86188f224cc9b391b5bdd92a3ba20ffcf;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ftrace: Fix warning when CONFIG_FUNCTION_TRACER is not defined

The struct ftrace_hash was declared within CONFIG_FUNCTION_TRACER
but was referenced outside of it.

Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---

diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index ed0eb5254d1c..f0c0e8a47ae6 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -19,6 +19,8 @@
 
 #include <asm/ftrace.h>
 
+struct ftrace_hash;
+
 #ifdef CONFIG_FUNCTION_TRACER
 
 extern int ftrace_enabled;
@@ -29,8 +31,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
 
 typedef void (*ftrace_func_t)(unsigned long ip, unsigned long parent_ip);
 
-struct ftrace_hash;
-
 enum {
 	FTRACE_OPS_FL_ENABLED		= 1 << 0,
 	FTRACE_OPS_FL_GLOBAL		= 1 << 1,