From: "Steven Rostedt (Red Hat)" <[email protected]> ftrace_trace_stack() is not called outside of trace.c. Make it a static function.
Signed-off-by: Steven Rostedt <[email protected]> --- kernel/trace/trace.c | 10 +++++++++- kernel/trace/trace.h | 8 -------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 3329c8efb34f..5d3ce2900d64 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -472,12 +472,20 @@ static inline void trace_access_lock_init(void) static void __ftrace_trace_stack(struct ring_buffer *buffer, unsigned long flags, int skip, int pc, struct pt_regs *regs); +static void ftrace_trace_stack(struct ring_buffer *buffer, unsigned long flags, + int skip, int pc); + #else static inline void __ftrace_trace_stack(struct ring_buffer *buffer, unsigned long flags, int skip, int pc, struct pt_regs *regs) { } +static inline void ftrace_trace_stack(struct ring_buffer *buffer, + unsigned long flags, int skip, int pc) +{ +} + #endif /* trace_flags holds trace_options default values */ @@ -1872,7 +1880,7 @@ static void __ftrace_trace_stack(struct ring_buffer *buffer, } -void ftrace_trace_stack(struct ring_buffer *buffer, unsigned long flags, +static void ftrace_trace_stack(struct ring_buffer *buffer, unsigned long flags, int skip, int pc) { if (!(trace_flags & TRACE_ITER_STACKTRACE)) diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 3b2a950a6291..107cf081ac27 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -611,20 +611,12 @@ void update_max_tr_single(struct trace_array *tr, #endif /* CONFIG_TRACER_MAX_TRACE */ #ifdef CONFIG_STACKTRACE -void ftrace_trace_stack(struct ring_buffer *buffer, unsigned long flags, - int skip, int pc); - void ftrace_trace_userstack(struct ring_buffer *buffer, unsigned long flags, int pc); void __trace_stack(struct trace_array *tr, unsigned long flags, int skip, int pc); #else -static inline void ftrace_trace_stack(struct ring_buffer *buffer, - unsigned long flags, int skip, int pc) -{ -} - static inline void ftrace_trace_userstack(struct ring_buffer *buffer, unsigned long flags, int pc) { -- 2.5.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
