From: Uros Bizjak Date: Mon, 20 May 2024 08:09:24 +0000 (+0200) Subject: x86/percpu: Rename percpu_stable_op() to __raw_cpu_read_stable() X-Git-Tag: v6.11-rc1~127^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48908919c9062bf9472def7389dd7cd9c6a45b70;p=thirdparty%2Fkernel%2Flinux.git x86/percpu: Rename percpu_stable_op() to __raw_cpu_read_stable() Rename percpu_stable_op() to __raw_cpu_read_stable() to be in line with other read/write percpu accessors. No functional change intended. Signed-off-by: Uros Bizjak Signed-off-by: Ingo Molnar Cc: Uros Bizjak Cc: Andy Lutomirski Cc: Josh Poimboeuf Cc: Linus Torvalds Link: https://lore.kernel.org/r/20240520080951.121049-1-ubizjak@gmail.com --- diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h index c77393cd02731..39762fcfe3280 100644 --- a/arch/x86/include/asm/percpu.h +++ b/arch/x86/include/asm/percpu.h @@ -190,10 +190,10 @@ do { \ #endif /* CONFIG_USE_X86_SEG_SUPPORT */ -#define percpu_stable_op(size, op, _var) \ +#define __raw_cpu_read_stable(size, _var) \ ({ \ __pcpu_type_##size pfo_val__; \ - asm(__pcpu_op2_##size(op, __force_percpu_arg(a[var]), "%[val]") \ + asm(__pcpu_op2_##size("mov", __force_percpu_arg(a[var]), "%[val]") \ : [val] __pcpu_reg_##size("=", pfo_val__) \ : [var] "i" (&(_var))); \ (typeof(_var))(unsigned long) pfo_val__; \ @@ -480,9 +480,9 @@ do { \ #define this_cpu_read_const(pcp) __raw_cpu_read_const(pcp) -#define this_cpu_read_stable_1(pcp) percpu_stable_op(1, "mov", pcp) -#define this_cpu_read_stable_2(pcp) percpu_stable_op(2, "mov", pcp) -#define this_cpu_read_stable_4(pcp) percpu_stable_op(4, "mov", pcp) +#define this_cpu_read_stable_1(pcp) __raw_cpu_read_stable(1, pcp) +#define this_cpu_read_stable_2(pcp) __raw_cpu_read_stable(2, pcp) +#define this_cpu_read_stable_4(pcp) __raw_cpu_read_stable(4, pcp) #define raw_cpu_add_1(pcp, val) percpu_add_op(1, , (pcp), val) #define raw_cpu_add_2(pcp, val) percpu_add_op(2, , (pcp), val) @@ -535,7 +535,7 @@ do { \ * 32 bit must fall back to generic operations. */ #ifdef CONFIG_X86_64 -#define this_cpu_read_stable_8(pcp) percpu_stable_op(8, "mov", pcp) +#define this_cpu_read_stable_8(pcp) __raw_cpu_read_stable(8, pcp) #define raw_cpu_add_8(pcp, val) percpu_add_op(8, , (pcp), val) #define raw_cpu_and_8(pcp, val) percpu_binary_op(8, , "and", (pcp), val)