From e2d1bade0b53e95b0c4b3988bcf63d1fe0b42401 Mon Sep 17 00:00:00 2001 From: Nick Alcock Date: Mon, 23 Feb 2015 14:06:41 +0000 Subject: [PATCH] dtrace: percpu: move from __get_cpu_var() to this_cpu_ptr() __get_cpu_var() was removed. Use this_cpu_ptr() instead, like the rest of the kernel tree. Signed-off-by: Nick Alcock Acked-by: Kris Van Hees --- include/linux/dtrace_cpu_defines.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/dtrace_cpu_defines.h b/include/linux/dtrace_cpu_defines.h index ca2bfb05180d..99199ca1f98b 100644 --- a/include/linux/dtrace_cpu_defines.h +++ b/include/linux/dtrace_cpu_defines.h @@ -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_ */ -- 2.50.1