[<prev] [next>] [day] [month] [year] [list]
Message-ID: <1310400156.3931.1.camel@gandalf.stny.rr.com>
Date: Mon, 11 Jul 2011 12:02:36 -0400
From: Steven Rostedt <rostedt@...dmis.org>
To: LKML <linux-kernel@...r.kernel.org>
Cc: Ingo Molnar <mingo@...e.hu>
Subject: [PATCH][GIT PULL][v3.0] ftrace: Fix warning when
CONFIG_FUNCTION_TRACER is not defined
Ingo,
Please pull the latest tip/perf/urgent tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/perf/urgent
Head SHA1: 04da85b86188f224cc9b391b5bdd92a3ba20ffcf
Steven Rostedt (1):
ftrace: Fix warning when CONFIG_FUNCTION_TRACER is not defined
----
include/linux/ftrace.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---------------------------
commit 04da85b86188f224cc9b391b5bdd92a3ba20ffcf
Author: Steven Rostedt <srostedt@...hat.com>
Date: Mon Jul 11 10:12:59 2011 -0400
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@...e.hu>
Signed-off-by: Steven Rostedt <rostedt@...dmis.org>
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index ed0eb52..f0c0e8a 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,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists