diff options
| author | Li Zefan <lizf@cn.fujitsu.com> | 2010-05-10 11:23:00 +0800 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2010-05-14 14:33:24 -0400 |
| commit | e1f7992e015ae1373d66c8068d0a45e4111a0aed (patch) | |
| tree | 8d4ce98a0039a5ab13e72f1c1862a595be1d9987 /kernel | |
| parent | 553552ce1796c32cf4e3d4f45cd5b537de91dd1d (diff) | |
| download | op-kernel-dev-e1f7992e015ae1373d66c8068d0a45e4111a0aed.zip op-kernel-dev-e1f7992e015ae1373d66c8068d0a45e4111a0aed.tar.gz | |
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.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
LKML-Reference: <4BE77C14.5010806@cn.fujitsu.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 6356259..40cd171 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -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) { } |
