lkml.org 
[lkml]   [2011]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] ftrace: Fix building warning with !CONFIG_FUNCTION_TRACER
From
Date
Commit 43dd61c(ftrace: Fix regression of :mod:module function enabling)
causes below warning because ‘struct ftrace_hash’ is not declared with
!CONFIG_FUNCTION_TRACER.

In file included from /linux-2.6/include/linux/perf_event.h:508:0,
from /linux-2.6/include/linux/ftrace_event.h:8,
from /linux-2.6/include/trace/syscall.h:6,
from /linux-2.6/include/linux/syscalls.h:77,
from /linux-2.6/arch/x86/ia32/ipc32.c:4:
/linux-2.6/include/linux/ftrace.h:128:6: warning: ‘struct ftrace_hash’
declared inside parameter list [enabled by default]
/linux-2.6/include/linux/ftrace.h:128:6: warning: its scope is only this
definition or declaration, which is probably not what you want [enabled
by default]

Fixed it by declaring "struct ftrace_hash" outside of
#ifdef CONFIG_FUNCTION_TRACER

Signed-off-by: Lin Ming <ming.m.lin@intel.com>
---
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 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@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2011-07-15 07:27    [W:0.056 / U:0.092 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site