* [PATCH] tracing: Fix function declarations if !CONFIG_STACKTRACE
@ 2010-05-10 3:23 Li Zefan
2010-05-12 2:26 ` Steven Rostedt
2010-05-21 17:12 ` [tip:perf/core] " tip-bot for Li Zefan
0 siblings, 2 replies; 3+ messages in thread
From: Li Zefan @ 2010-05-10 3:23 UTC (permalink / raw)
To: Steven Rostedt; +Cc: Frederic Weisbecker, LKML
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>
---
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 d1ce0be..58f6896 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -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)
{
}
--
1.6.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] tracing: Fix function declarations if !CONFIG_STACKTRACE
2010-05-10 3:23 [PATCH] tracing: Fix function declarations if !CONFIG_STACKTRACE Li Zefan
@ 2010-05-12 2:26 ` Steven Rostedt
2010-05-21 17:12 ` [tip:perf/core] " tip-bot for Li Zefan
1 sibling, 0 replies; 3+ messages in thread
From: Steven Rostedt @ 2010-05-12 2:26 UTC (permalink / raw)
To: Li Zefan; +Cc: Frederic Weisbecker, LKML
On Mon, 2010-05-10 at 11:23 +0800, Li Zefan wrote:
> 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>
Thanks Li,
I'll add this when I'm finished working on the TRACE_EVENT() updates.
-- Steve
> ---
> 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 d1ce0be..58f6896 100644
> --- a/kernel/trace/trace.h
> +++ b/kernel/trace/trace.h
> @@ -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)
> {
> }
^ permalink raw reply [flat|nested] 3+ messages in thread* [tip:perf/core] tracing: Fix function declarations if !CONFIG_STACKTRACE
2010-05-10 3:23 [PATCH] tracing: Fix function declarations if !CONFIG_STACKTRACE Li Zefan
2010-05-12 2:26 ` Steven Rostedt
@ 2010-05-21 17:12 ` tip-bot for Li Zefan
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Li Zefan @ 2010-05-21 17:12 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, rostedt, lizf, tglx
Commit-ID: e1f7992e015ae1373d66c8068d0a45e4111a0aed
Gitweb: http://git.kernel.org/tip/e1f7992e015ae1373d66c8068d0a45e4111a0aed
Author: Li Zefan <lizf@cn.fujitsu.com>
AuthorDate: Mon, 10 May 2010 11:23:00 +0800
Committer: Steven Rostedt <rostedt@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@cn.fujitsu.com>
LKML-Reference: <4BE77C14.5010806@cn.fujitsu.com>
Signed-off-by: Steven Rostedt <rostedt@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)
{
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-05-21 17:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-10 3:23 [PATCH] tracing: Fix function declarations if !CONFIG_STACKTRACE Li Zefan
2010-05-12 2:26 ` Steven Rostedt
2010-05-21 17:12 ` [tip:perf/core] " tip-bot for Li Zefan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.