From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@elte.hu>,
Andrew Morton <akpm@linux-foundation.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Mathieu Desnoyers <compudj@krystal.dyndns.org>,
Masami Hiramatsu <mhiramat@redhat.com>,
Li Zefan <lizf@cn.fujitsu.com>
Subject: [PATCH 11/13 v3] tracing: Fix function declarations if !CONFIG_STACKTRACE
Date: Fri, 14 May 2010 15:22:57 -0400 [thread overview]
Message-ID: <20100514192916.699062652@goodmis.org> (raw)
In-Reply-To: 20100514192246.079025623@goodmis.org
[-- Attachment #1: 0011-tracing-Fix-function-declarations-if-CONFIG_STACKTRA.patch --]
[-- Type: text/plain, Size: 1192 bytes --]
From: Li Zefan <lizf@cn.fujitsu.com>
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)
{
}
--
1.7.0
next prev parent reply other threads:[~2010-05-14 19:31 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-14 19:22 [PATCH 00/13 v3] [GIT PULL] tracing: shrinking trace events and updates Steven Rostedt
2010-05-14 19:22 ` [PATCH 01/13 v3] tracing: Create class struct for events Steven Rostedt
2010-05-14 19:22 ` [PATCH 02/13 v3] tracepoints: Add check trace callback type Steven Rostedt
2010-05-14 19:22 ` [PATCH 03/13 v3] tracing: Let tracepoints have data passed to tracepoint callbacks Steven Rostedt
2010-05-14 19:22 ` [PATCH 04/13 v3] tracing: Remove per event trace registering Steven Rostedt
2010-05-14 19:22 ` [PATCH 05/13 v3] tracing: Move fields from event to class structure Steven Rostedt
2010-05-18 4:51 ` Li Zefan
2010-05-14 19:22 ` [PATCH 06/13 v3] tracing: Move raw_init from events to class Steven Rostedt
2010-05-14 19:22 ` [PATCH 07/13 v3] tracing: Allow events to share their print functions Steven Rostedt
2010-05-14 19:22 ` [PATCH 08/13 v3] tracing: Move print functions into event class Steven Rostedt
2010-05-14 19:22 ` [PATCH 09/13 v3] tracing: Remove duplicate id information in event structure Steven Rostedt
2010-05-14 19:22 ` [PATCH 10/13 v3] tracing: Combine event filter_active and enable into single flags field Steven Rostedt
2010-05-14 19:22 ` Steven Rostedt [this message]
2010-05-14 19:22 ` [PATCH 12/13 v3] ring-buffer: Add cached pages when freeing reader page Steven Rostedt
2010-05-14 22:26 ` Mathieu Desnoyers
2010-05-15 1:06 ` Steven Rostedt
2010-05-14 19:22 ` [PATCH 13/13 v3] tracing: Comment the use of event_mutex with trace event flags Steven Rostedt
2010-05-14 22:21 ` Mathieu Desnoyers
2010-05-15 0:44 ` Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100514192916.699062652@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=compudj@krystal.dyndns.org \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizf@cn.fujitsu.com \
--cc=mhiramat@redhat.com \
--cc=mingo@elte.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox