]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
dtrace: percpu: move from __get_cpu_var() to this_cpu_ptr()
authorNick Alcock <nick.alcock@oracle.com>
Mon, 23 Feb 2015 14:06:41 +0000 (14:06 +0000)
committerNick Alcock <nick.alcock@oracle.com>
Tue, 21 Jul 2015 14:30:07 +0000 (15:30 +0100)
__get_cpu_var() was removed.  Use this_cpu_ptr() instead, like the rest of the
kernel tree.

Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
Acked-by: Kris Van Hees <kris.van.hees@oracle.com>
include/linux/dtrace_cpu_defines.h

index ca2bfb05180d3e409fdb501106661336ca42bfe2..99199ca1f98b14cbb2759dd2cbb58a0f7b1a908b 100644 (file)
@@ -10,7 +10,7 @@
 #define CPUC_PADSIZE   (192 - CPUC_SIZE)
 
 #define per_cpu_core(cpu)      (&per_cpu(dtrace_cpu_core, (cpu)))
-#define this_cpu_core          (&__get_cpu_var(dtrace_cpu_core))
+#define this_cpu_core          (this_cpu_ptr(&dtrace_cpu_core))
 
 #define DTRACE_CPUFLAG_ISSET(flag) \
        (this_cpu_core->cpuc_dtrace_flags & (flag))
@@ -52,6 +52,6 @@ struct cpu_core;
 struct cpuinfo;
 
 #define per_cpu_info(cpu)      (&per_cpu(dtrace_cpu_info, (cpu)))
-#define this_cpu_info          (&__get_cpu_var(dtrace_cpu_info))
+#define this_cpu_info          (this_cpu_ptr(&dtrace_cpu_info))
 
 #endif /* _LINUX_DTRACE_CPU_DEFINES_H_ */