tracing: Fix function declarations if !CONFIG_STACKTRACE
PATCH 1/1 tracing: Fix function declarations if !CONFIG_STACKTRACE
ftrace_trace_stack() and frace_trace_userstacke() take a struct ring_buffer argument, not struct trace_array. Commit e77405ad("tracing: pass around ring buffer instead of tracer") made this change.
--- kernel/trace/trace.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
kernel/trace/trace.h +2 -2
@@ -405,12 +405,12 @@ void ftrace_trace_userstack(struct ring_buffer *buffer, unsigned long flags,void __trace_stack (struct trace_array *tr,unsigned long flags,int skip,int pc);#else -static inline void ftrace_trace_stack (struct trace_array *tr, +static inline void ftrace_trace_stack (struct ring_buffer *buffer,unsigned long flags,int skip,int pc) { } -static inline void ftrace_trace_userstack (struct trace_array *tr, +static inline void ftrace_trace_userstack (struct ring_buffer *buffer,unsigned long flags,int pc) { }
Signature · 1 line
1.6.3
Steven Rostedt
maintainerQuoted 6 lines · Li Zefan
ftrace_trace_stack()andfrace_trace_userstacke()take a structring_bufferargument, not structtrace_array. Commite77405ad("tracing: pass around ring buffer instead of tracer")made this change.Signed-off-by Li Zefan <[email protected]>
Thanks Li,
I'll add this when I'm finished working on the TRACE_EVENT() updates.
-- Steve
Quoted 23 lines
--- kernel/trace/trace.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)kernel/trace/trace.h +2
-2@@ -405,12 +405,12 @@ void ftrace_trace_userstack(struct ring_buffer *buffer, unsigned long flags,void __trace_stack (struct trace_array *tr,unsigned long flags,int skip,int pc);#else -static inline void ftrace_trace_stack (struct trace_array *tr, +static inline void ftrace_trace_stack (struct ring_buffer *buffer,unsigned long flags,int skip,int pc) { } -static inline void ftrace_trace_userstack (struct trace_array *tr, +static inline void ftrace_trace_userstack (struct ring_buffer *buffer,unsigned long flags,int pc) { }
Commit-ID: e1f7992e015ae1373d66c8068d0a45e4111a0aed Gitweb: http://git.kernel.org/tip/e1f7992e015ae1373d66c8068d0a45e4111a0aed Author: Li Zefan <[email protected]> AuthorDate: Mon, 10 May 2010 11:23:00 +0800 Committer: Steven Rostedt <[email protected]> CommitDate: Fri, 14 May 2010 14:33:24 -0400
tracing: Fix function declarations if !CONFIG_STACKTRACE
ftrace_trace_stack() and frace_trace_userstacke() take a struct ring_buffer argument, not struct trace_array. Commit e77405ad("tracing: pass around ring buffer instead of tracer") made this change.
LKML-Reference: <[email protected]>
--- kernel/trace/trace.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
kernel/trace/trace.h +2 -2
@@ -419,12 +419,12 @@ void ftrace_trace_userstack(struct ring_buffer *buffer, unsigned long flags,void __trace_stack (struct trace_array *tr,unsigned long flags,int skip,int pc);#else -static inline void ftrace_trace_stack (struct trace_array *tr, +static inline void ftrace_trace_stack (struct ring_buffer *buffer,unsigned long flags,int skip,int pc) { } -static inline void ftrace_trace_userstack (struct trace_array *tr, +static inline void ftrace_trace_userstack (struct ring_buffer *buffer,unsigned long flags,int pc) { }