diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2011-07-11 10:12:59 -0400 |
|---|---|---|
| committer | Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> | 2011-11-21 12:54:45 -0500 |
| commit | e5cbdbc1149e5e16fa046ffe8a42e036fa595dcc (patch) | |
| tree | 85a25a7c275afe54c02d2465128d4fc2ee5c9cbc /include/linux | |
| parent | e34a61e2387c0c68b4605d2dc6743a35c434cfae (diff) | |
ftrace: Fix warning when CONFIG_FUNCTION_TRACER is not defined
BugLink: http://bugs.launchpad.net/bugs/881420
commit 04da85b86188f224cc9b391b5bdd92a3ba20ffcf upstream.
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>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ftrace.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index ed0eb5254d1..f0c0e8a47ae 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h | |||
| @@ -19,6 +19,8 @@ | |||
| 19 | 19 | ||
| 20 | #include <asm/ftrace.h> | 20 | #include <asm/ftrace.h> |
| 21 | 21 | ||
| 22 | struct ftrace_hash; | ||
| 23 | |||
| 22 | #ifdef CONFIG_FUNCTION_TRACER | 24 | #ifdef CONFIG_FUNCTION_TRACER |
| 23 | 25 | ||
| 24 | extern int ftrace_enabled; | 26 | extern int ftrace_enabled; |
| @@ -29,8 +31,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write, | |||
| 29 | 31 | ||
| 30 | typedef void (*ftrace_func_t)(unsigned long ip, unsigned long parent_ip); | 32 | typedef void (*ftrace_func_t)(unsigned long ip, unsigned long parent_ip); |
| 31 | 33 | ||
| 32 | struct ftrace_hash; | ||
| 33 | |||
| 34 | enum { | 34 | enum { |
| 35 | FTRACE_OPS_FL_ENABLED = 1 << 0, | 35 | FTRACE_OPS_FL_ENABLED = 1 << 0, |
| 36 | FTRACE_OPS_FL_GLOBAL = 1 << 1, | 36 | FTRACE_OPS_FL_GLOBAL = 1 << 1, |
