From: Steven Rostedt <rostedt@goodmis.org>
To: Christoph Lameter <cl@linux.com>
Cc: Ingo Molnar <mingo@redhat.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
linux-kernel@vger.kernel.org
Subject: Re: tracing: Replace __get_cpu_var uses with this_cpu_ptr
Date: Tue, 6 May 2014 08:35:36 -0400 [thread overview]
Message-ID: <20140506083536.7316e35a@gandalf.local.home> (raw)
In-Reply-To: <alpine.DEB.2.10.1404291415560.18364@gentwo.org>
On Tue, 29 Apr 2014 14:17:40 -0500 (CDT)
Christoph Lameter <cl@linux.com> wrote:
> Replace uses of &__get_cpu_var for address calculation with this_cpu_ptr.
>
I pulled this into my 3.16 queue.
-- Steve
> Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> Signed-off-by: Christoph Lameter <cl@linux.com>
>
> Index: linux/include/linux/kprobes.h
> ===================================================================
> --- linux.orig/include/linux/kprobes.h 2014-04-28 13:09:07.228660946 -0500
> +++ linux/include/linux/kprobes.h 2014-04-28 13:09:07.224661022 -0500
> @@ -356,7 +356,7 @@
>
> static inline struct kprobe_ctlblk *get_kprobe_ctlblk(void)
> {
> - return (&__get_cpu_var(kprobe_ctlblk));
> + return this_cpu_ptr(&kprobe_ctlblk);
> }
>
> int register_kprobe(struct kprobe *p);
> Index: linux/kernel/trace/ftrace.c
> ===================================================================
> --- linux.orig/kernel/trace/ftrace.c 2014-04-28 13:09:07.228660946 -0500
> +++ linux/kernel/trace/ftrace.c 2014-04-28 13:09:07.224661022 -0500
> @@ -817,7 +817,7 @@
>
> local_irq_save(flags);
>
> - stat = &__get_cpu_var(ftrace_profile_stats);
> + stat = this_cpu_ptr(&ftrace_profile_stats);
> if (!stat->hash || !ftrace_profile_enabled)
> goto out;
>
> @@ -848,7 +848,7 @@
> unsigned long flags;
>
> local_irq_save(flags);
> - stat = &__get_cpu_var(ftrace_profile_stats);
> + stat = this_cpu_ptr(&ftrace_profile_stats);
> if (!stat->hash || !ftrace_profile_enabled)
> goto out;
>
> Index: linux/kernel/trace/trace.c
> ===================================================================
> --- linux.orig/kernel/trace/trace.c 2014-04-28 13:09:07.228660946 -0500
> +++ linux/kernel/trace/trace.c 2014-04-28 13:09:07.228660946 -0500
> @@ -1728,7 +1728,7 @@
> */
> barrier();
> if (use_stack == 1) {
> - trace.entries = &__get_cpu_var(ftrace_stack).calls[0];
> + trace.entries = this_cpu_ptr(ftrace_stack.calls);
> trace.max_entries = FTRACE_STACK_MAX_ENTRIES;
>
> if (regs)
next prev parent reply other threads:[~2014-05-06 12:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-29 19:17 Christoph Lameter
2014-05-06 12:35 ` Steven Rostedt [this message]
2014-05-06 14:53 ` 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=20140506083536.7316e35a@gandalf.local.home \
--to=rostedt@goodmis.org \
--cc=cl@linux.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@redhat.com \
/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
all inboxes | Powered by JetHome®