mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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 1/4] tracing: Fix function declarations if !CONFIG_STACKTRACE
Date: Wed, 12 May 2010 21:21:11 -0400	[thread overview]
Message-ID: <20100513012301.484726547@goodmis.org> (raw)
In-Reply-To: <20100513012110.558313399@goodmis.org>

[-- Attachment #1: 0001-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



  reply	other threads:[~2010-05-13  1:23 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-13  1:21 [PATCH 0/4] [GIT PULL] tracing: updates Steven Rostedt
2010-05-13  1:21 ` Steven Rostedt [this message]
2010-05-13  1:21 ` [PATCH 2/4] tracing/sched: Fix task states in sched switch event Steven Rostedt
2010-05-13  6:15   ` Ingo Molnar
2010-05-13  1:21 ` [PATCH 3/4] tracing: Allow mmio tracer to display trace_printk() and other events Steven Rostedt
2010-05-13  8:54   ` Pekka Paalanen
2010-05-13 12:15     ` Steven Rostedt
2010-05-13 12:29       ` Pekka Paalanen
2010-05-13 15:11         ` Steven Rostedt
2010-05-13 19:42           ` Steven Rostedt
2010-05-15  7:46           ` Pekka Paalanen
2010-05-16  1:29             ` Steven Rostedt
2010-05-13  1:21 ` [PATCH 4/4] tracing: Update branch trace to new event API 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=20100513012301.484726547@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome