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>,
Li Zefan <lizf@cn.fujitsu.com>
Subject: [PATCH 11/12 v2] tracing: Fix function declarations if !CONFIG_STACKTRACE
Date: Thu, 13 May 2010 18:10:15 -0400 [thread overview]
Message-ID: <20100513221249.828023731@goodmis.org> (raw)
In-Reply-To: 20100513221004.765293881@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-13 22:13 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-13 22:10 [PATCH 00/12 v2] [GIT PULL] tracing: shrinking trace events and updates Steven Rostedt
2010-05-13 22:10 ` [PATCH 01/12 v2] tracing: Create class struct for events Steven Rostedt
2010-05-13 22:10 ` [PATCH 02/12 v2] tracepoints: Add check trace callback type Steven Rostedt
2010-05-13 22:10 ` [PATCH 03/12 v2] tracing: Let tracepoints have data passed to tracepoint callbacks Steven Rostedt
2010-05-13 22:10 ` [PATCH 04/12 v2] tracing: Remove per event trace registering Steven Rostedt
2010-05-13 22:10 ` [PATCH 05/12 v2] tracing: Move fields from event to class structure Steven Rostedt
2010-05-13 22:10 ` [PATCH 06/12 v2] tracing: Move raw_init from events to class Steven Rostedt
2010-05-13 22:10 ` [PATCH 07/12 v2] tracing: Allow events to share their print functions Steven Rostedt
2010-05-13 22:10 ` [PATCH 08/12 v2] tracing: Move print functions into event class Steven Rostedt
2010-05-13 22:10 ` [PATCH 09/12 v2] tracing: Remove duplicate id information in event structure Steven Rostedt
2010-05-13 22:10 ` [PATCH 10/12 v2] tracing: Combine event filter_active and enable into single flags field Steven Rostedt
2010-05-13 22:10 ` Steven Rostedt [this message]
2010-05-13 22:10 ` [PATCH 12/12 v2] ring-buffer: Add cached pages when freeing reader page Steven Rostedt
2010-05-13 23:23 ` 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=20100513221249.828023731@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizf@cn.fujitsu.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 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.