4 files changed, 260 insertions, 198 deletions

diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h
index 94220d14d5cc..851bcdc5db04 100644
--- a/arch/x86/include/asm/percpu.h
+++ b/arch/x86/include/asm/percpu.h
@@ -52,7 +52,7 @@
  * Compared to the generic __my_cpu_offset version, the following
  * saves one instruction and avoids clobbering a temp register.
  */
-#define __this_cpu_ptr(ptr)                             \
+#define raw_cpu_ptr(ptr)                                \
 ({                                                      \
         unsigned long tcp_ptr__;                        \
         __verify_pcpu_ptr(ptr);                         \
@@ -362,25 +362,25 @@ do {									\
  */
 #define this_cpu_read_stable(var)       percpu_from_op("mov", var, "p" (&(var)))
 
-#define __this_cpu_read_1(pcp)          percpu_from_op("mov", (pcp), "m"(pcp))
-#define __this_cpu_read_2(pcp)          percpu_from_op("mov", (pcp), "m"(pcp))
-#define __this_cpu_read_4(pcp)          percpu_from_op("mov", (pcp), "m"(pcp))
-
-#define __this_cpu_write_1(pcp, val)    percpu_to_op("mov", (pcp), val)
-#define __this_cpu_write_2(pcp, val)    percpu_to_op("mov", (pcp), val)
-#define __this_cpu_write_4(pcp, val)    percpu_to_op("mov", (pcp), val)
-#define __this_cpu_add_1(pcp, val)      percpu_add_op((pcp), val)
-#define __this_cpu_add_2(pcp, val)      percpu_add_op((pcp), val)
-#define __this_cpu_add_4(pcp, val)      percpu_add_op((pcp), val)
-#define __this_cpu_and_1(pcp, val)      percpu_to_op("and", (pcp), val)
-#define __this_cpu_and_2(pcp, val)      percpu_to_op("and", (pcp), val)
-#define __this_cpu_and_4(pcp, val)      percpu_to_op("and", (pcp), val)
-#define __this_cpu_or_1(pcp, val)       percpu_to_op("or", (pcp), val)
-#define __this_cpu_or_2(pcp, val)       percpu_to_op("or", (pcp), val)
-#define __this_cpu_or_4(pcp, val)       percpu_to_op("or", (pcp), val)
-#define __this_cpu_xchg_1(pcp, val)     percpu_xchg_op(pcp, val)
-#define __this_cpu_xchg_2(pcp, val)     percpu_xchg_op(pcp, val)
-#define __this_cpu_xchg_4(pcp, val)     percpu_xchg_op(pcp, val)
+#define raw_cpu_read_1(pcp)             percpu_from_op("mov", (pcp), "m"(pcp))
+#define raw_cpu_read_2(pcp)             percpu_from_op("mov", (pcp), "m"(pcp))
+#define raw_cpu_read_4(pcp)             percpu_from_op("mov", (pcp), "m"(pcp))
+
+#define raw_cpu_write_1(pcp, val)       percpu_to_op("mov", (pcp), val)
+#define raw_cpu_write_2(pcp, val)       percpu_to_op("mov", (pcp), val)
+#define raw_cpu_write_4(pcp, val)       percpu_to_op("mov", (pcp), val)
+#define raw_cpu_add_1(pcp, val)         percpu_add_op((pcp), val)
+#define raw_cpu_add_2(pcp, val)         percpu_add_op((pcp), val)
+#define raw_cpu_add_4(pcp, val)         percpu_add_op((pcp), val)
+#define raw_cpu_and_1(pcp, val)         percpu_to_op("and", (pcp), val)
+#define raw_cpu_and_2(pcp, val)         percpu_to_op("and", (pcp), val)
+#define raw_cpu_and_4(pcp, val)         percpu_to_op("and", (pcp), val)
+#define raw_cpu_or_1(pcp, val)          percpu_to_op("or", (pcp), val)
+#define raw_cpu_or_2(pcp, val)          percpu_to_op("or", (pcp), val)
+#define raw_cpu_or_4(pcp, val)          percpu_to_op("or", (pcp), val)
+#define raw_cpu_xchg_1(pcp, val)        percpu_xchg_op(pcp, val)
+#define raw_cpu_xchg_2(pcp, val)        percpu_xchg_op(pcp, val)
+#define raw_cpu_xchg_4(pcp, val)        percpu_xchg_op(pcp, val)
 
 #define this_cpu_read_1(pcp)            percpu_from_op("mov", (pcp), "m"(pcp))
 #define this_cpu_read_2(pcp)            percpu_from_op("mov", (pcp), "m"(pcp))
@@ -401,16 +401,16 @@ do {									\
 #define this_cpu_xchg_2(pcp, nval)      percpu_xchg_op(pcp, nval)
 #define this_cpu_xchg_4(pcp, nval)      percpu_xchg_op(pcp, nval)
 
-#define __this_cpu_add_return_1(pcp, val) percpu_add_return_op(pcp, val)
-#define __this_cpu_add_return_2(pcp, val) percpu_add_return_op(pcp, val)
-#define __this_cpu_add_return_4(pcp, val) percpu_add_return_op(pcp, val)
-#define __this_cpu_cmpxchg_1(pcp, oval, nval)   percpu_cmpxchg_op(pcp, oval, nval)
-#define __this_cpu_cmpxchg_2(pcp, oval, nval)   percpu_cmpxchg_op(pcp, oval, nval)
-#define __this_cpu_cmpxchg_4(pcp, oval, nval)   percpu_cmpxchg_op(pcp, oval, nval)
+#define raw_cpu_add_return_1(pcp, val)          percpu_add_return_op(pcp, val)
+#define raw_cpu_add_return_2(pcp, val)          percpu_add_return_op(pcp, val)
+#define raw_cpu_add_return_4(pcp, val)          percpu_add_return_op(pcp, val)
+#define raw_cpu_cmpxchg_1(pcp, oval, nval)      percpu_cmpxchg_op(pcp, oval, nval)
+#define raw_cpu_cmpxchg_2(pcp, oval, nval)      percpu_cmpxchg_op(pcp, oval, nval)
+#define raw_cpu_cmpxchg_4(pcp, oval, nval)      percpu_cmpxchg_op(pcp, oval, nval)
 
-#define this_cpu_add_return_1(pcp, val) percpu_add_return_op(pcp, val)
-#define this_cpu_add_return_2(pcp, val) percpu_add_return_op(pcp, val)
-#define this_cpu_add_return_4(pcp, val) percpu_add_return_op(pcp, val)
+#define this_cpu_add_return_1(pcp, val)         percpu_add_return_op(pcp, val)
+#define this_cpu_add_return_2(pcp, val)         percpu_add_return_op(pcp, val)
+#define this_cpu_add_return_4(pcp, val)         percpu_add_return_op(pcp, val)
 #define this_cpu_cmpxchg_1(pcp, oval, nval)     percpu_cmpxchg_op(pcp, oval, nval)
 #define this_cpu_cmpxchg_2(pcp, oval, nval)     percpu_cmpxchg_op(pcp, oval, nval)
 #define this_cpu_cmpxchg_4(pcp, oval, nval)     percpu_cmpxchg_op(pcp, oval, nval)
@@ -427,7 +427,7 @@ do {									\
         __ret;                                                          \
 })
 
-#define __this_cpu_cmpxchg_double_4     percpu_cmpxchg8b_double
+#define raw_cpu_cmpxchg_double_4        percpu_cmpxchg8b_double
 #define this_cpu_cmpxchg_double_4       percpu_cmpxchg8b_double
 #endif /* CONFIG_X86_CMPXCHG64 */
 
@@ -436,22 +436,22 @@ do {									\
  * 32 bit must fall back to generic operations.
  */
 #ifdef CONFIG_X86_64
-#define __this_cpu_read_8(pcp)          percpu_from_op("mov", (pcp), "m"(pcp))
-#define __this_cpu_write_8(pcp, val)    percpu_to_op("mov", (pcp), val)
-#define __this_cpu_add_8(pcp, val)      percpu_add_op((pcp), val)
-#define __this_cpu_and_8(pcp, val)      percpu_to_op("and", (pcp), val)
-#define __this_cpu_or_8(pcp, val)       percpu_to_op("or", (pcp), val)
-#define __this_cpu_add_return_8(pcp, val) percpu_add_return_op(pcp, val)
-#define __this_cpu_xchg_8(pcp, nval)    percpu_xchg_op(pcp, nval)
-#define __this_cpu_cmpxchg_8(pcp, oval, nval)   percpu_cmpxchg_op(pcp, oval, nval)
-
-#define this_cpu_read_8(pcp)            percpu_from_op("mov", (pcp), "m"(pcp))
-#define this_cpu_write_8(pcp, val)      percpu_to_op("mov", (pcp), val)
-#define this_cpu_add_8(pcp, val)        percpu_add_op((pcp), val)
-#define this_cpu_and_8(pcp, val)        percpu_to_op("and", (pcp), val)
-#define this_cpu_or_8(pcp, val)         percpu_to_op("or", (pcp), val)
-#define this_cpu_add_return_8(pcp, val) percpu_add_return_op(pcp, val)
-#define this_cpu_xchg_8(pcp, nval)      percpu_xchg_op(pcp, nval)
+#define raw_cpu_read_8(pcp)                     percpu_from_op("mov", (pcp), "m"(pcp))
+#define raw_cpu_write_8(pcp, val)               percpu_to_op("mov", (pcp), val)
+#define raw_cpu_add_8(pcp, val)                 percpu_add_op((pcp), val)
+#define raw_cpu_and_8(pcp, val)                 percpu_to_op("and", (pcp), val)
+#define raw_cpu_or_8(pcp, val)                  percpu_to_op("or", (pcp), val)
+#define raw_cpu_add_return_8(pcp, val)          percpu_add_return_op(pcp, val)
+#define raw_cpu_xchg_8(pcp, nval)               percpu_xchg_op(pcp, nval)
+#define raw_cpu_cmpxchg_8(pcp, oval, nval)      percpu_cmpxchg_op(pcp, oval, nval)
+
+#define this_cpu_read_8(pcp)                    percpu_from_op("mov", (pcp), "m"(pcp))
+#define this_cpu_write_8(pcp, val)              percpu_to_op("mov", (pcp), val)
+#define this_cpu_add_8(pcp, val)                percpu_add_op((pcp), val)
+#define this_cpu_and_8(pcp, val)                percpu_to_op("and", (pcp), val)
+#define this_cpu_or_8(pcp, val)                 percpu_to_op("or", (pcp), val)
+#define this_cpu_add_return_8(pcp, val)         percpu_add_return_op(pcp, val)
+#define this_cpu_xchg_8(pcp, nval)              percpu_xchg_op(pcp, nval)
 #define this_cpu_cmpxchg_8(pcp, oval, nval)     percpu_cmpxchg_op(pcp, oval, nval)
 
 /*
@@ -474,7 +474,7 @@ do {									\
         __ret;                                                          \
 })
 
-#define __this_cpu_cmpxchg_double_8     percpu_cmpxchg16b_double
+#define raw_cpu_cmpxchg_double_8        percpu_cmpxchg16b_double
 #define this_cpu_cmpxchg_double_8       percpu_cmpxchg16b_double
 
 #endif
@@ -495,9 +495,9 @@ static __always_inline int x86_this_cpu_constant_test_bit(unsigned int nr,
         unsigned long __percpu *a = (unsigned long *)addr + nr / BITS_PER_LONG;
 
 #ifdef CONFIG_X86_64
-        return ((1UL << (nr % BITS_PER_LONG)) & __this_cpu_read_8(*a)) != 0;
+        return ((1UL << (nr % BITS_PER_LONG)) & raw_cpu_read_8(*a)) != 0;
 #else
-        return ((1UL << (nr % BITS_PER_LONG)) & __this_cpu_read_4(*a)) != 0;
+        return ((1UL << (nr % BITS_PER_LONG)) & raw_cpu_read_4(*a)) != 0;
 #endif
 }
 
diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
index c8b051933b1b..7024c12f7bfe 100644
--- a/arch/x86/include/asm/preempt.h
+++ b/arch/x86/include/asm/preempt.h
@@ -19,12 +19,12 @@ DECLARE_PER_CPU(int, __preempt_count);
  */
 static __always_inline int preempt_count(void)
 {
-        return __this_cpu_read_4(__preempt_count) & ~PREEMPT_NEED_RESCHED;
+        return raw_cpu_read_4(__preempt_count) & ~PREEMPT_NEED_RESCHED;
 }
 
 static __always_inline void preempt_count_set(int pc)
 {
-        __this_cpu_write_4(__preempt_count, pc);
+        raw_cpu_write_4(__preempt_count, pc);
 }