Prev: [GIT PATCH] TTY patches for 2.6.35
Next: [tip:perf/core] tracepoints: Add check trace callback type
From: tip-bot for Li Zefan on 21 May 2010 13:20
Commit-ID: e1f7992e015ae1373d66c8068d0a45e4111a0aed
Gitweb: http://git.kernel.org/tip/e1f7992e015ae1373d66c8068d0a45e4111a0aed
Author: Li Zefan <lizf(a)cn.fujitsu.com>
AuthorDate: Mon, 10 May 2010 11:23:00 +0800
Committer: Steven Rostedt <rostedt(a)goodmis.org>
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.

Signed-off-by: Li Zefan <lizf(a)cn.fujitsu.com>
LKML-Reference: <4BE77C14.5010806(a)cn.fujitsu.com>
Signed-off-by: Steven Rostedt <rostedt(a)goodmis.org>
---
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)
{
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [GIT PATCH] TTY patches for 2.6.35
Next: [tip:perf/core] tracepoints: Add check trace callback type