mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Shan Wei <shanwei88@gmail.com>
To: rostedt@goodmis.org, fweisbec@gmail.com, mingo@redhat.com,
	Kernel-Maillist <linux-kernel@vger.kernel.org>,
	cl@linux-foundation.org
Subject: [PATCH 5/9] ftrace: use this_cpu_ptr per-cpu helper
Date: Wed, 31 Oct 2012 19:22:50 +0800	[thread overview]
Message-ID: <50910A0A.9010209@gmail.com> (raw)

From: Shan Wei <davidshan@tencent.com>

Signed-off-by: Shan Wei <davidshan@tencent.com>
---
 include/trace/ftrace.h |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index a763888..7c9fde7 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -638,7 +638,6 @@ __attribute__((section("_ftrace_events"))) *__event_##call = &event_##call
  *	struct trace_entry *ent;
  *	int __entry_size;
  *	int __data_size;
- *	int __cpu
  *	int pc;
  *
  *	pc = preempt_count();
@@ -654,7 +653,6 @@ __attribute__((section("_ftrace_events"))) *__event_##call = &event_##call
  *	// Protect the non nmi buffer
  *	// This also protects the rcu read side
  *	local_irq_save(irq_flags);
- *	__cpu = smp_processor_id();
  *
  *	if (in_nmi())
  *		trace_buf = rcu_dereference_sched(perf_trace_buf_nmi);
@@ -664,7 +662,7 @@ __attribute__((section("_ftrace_events"))) *__event_##call = &event_##call
  *	if (!trace_buf)
  *		goto end;
  *
- *	trace_buf = per_cpu_ptr(trace_buf, __cpu);
+ *	trace_buf = this_cpu_ptr(trace_buf);
  *
  * 	// Avoid recursion from perf that could mess up the buffer
  * 	if (trace_buf->recursion++)
-- 
1.7.1


             reply	other threads:[~2012-10-31 11:23 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-31 11:22 Shan Wei [this message]
2012-10-31 17:43 ` Christoph Lameter

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=50910A0A.9010209@gmail.com \
    --to=shanwei88@gmail.com \
    --cc=cl@linux-foundation.org \
    --cc=fweisbec@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=rostedt@goodmis.org \
    /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