Replace uses of &__get_cpu_var for address calculation with this_cpu_ptr.
Acked-by: Masami Hiramatsu <[email protected]>
Signed-off-by: Christoph Lameter <[email protected]>
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)