Skip to content

Commit 4890891

Browse files
ubizjakIngo Molnar
authored andcommitted
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 <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Cc: Uros Bizjak <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: Josh Poimboeuf <[email protected]> Cc: Linus Torvalds <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 1fe67ae commit 4890891

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

arch/x86/include/asm/percpu.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,10 @@ do { \
190190

191191
#endif /* CONFIG_USE_X86_SEG_SUPPORT */
192192

193-
#define percpu_stable_op(size, op, _var) \
193+
#define __raw_cpu_read_stable(size, _var) \
194194
({ \
195195
__pcpu_type_##size pfo_val__; \
196-
asm(__pcpu_op2_##size(op, __force_percpu_arg(a[var]), "%[val]") \
196+
asm(__pcpu_op2_##size("mov", __force_percpu_arg(a[var]), "%[val]") \
197197
: [val] __pcpu_reg_##size("=", pfo_val__) \
198198
: [var] "i" (&(_var))); \
199199
(typeof(_var))(unsigned long) pfo_val__; \
@@ -480,9 +480,9 @@ do { \
480480

481481
#define this_cpu_read_const(pcp) __raw_cpu_read_const(pcp)
482482

483-
#define this_cpu_read_stable_1(pcp) percpu_stable_op(1, "mov", pcp)
484-
#define this_cpu_read_stable_2(pcp) percpu_stable_op(2, "mov", pcp)
485-
#define this_cpu_read_stable_4(pcp) percpu_stable_op(4, "mov", pcp)
483+
#define this_cpu_read_stable_1(pcp) __raw_cpu_read_stable(1, pcp)
484+
#define this_cpu_read_stable_2(pcp) __raw_cpu_read_stable(2, pcp)
485+
#define this_cpu_read_stable_4(pcp) __raw_cpu_read_stable(4, pcp)
486486

487487
#define raw_cpu_add_1(pcp, val) percpu_add_op(1, , (pcp), val)
488488
#define raw_cpu_add_2(pcp, val) percpu_add_op(2, , (pcp), val)
@@ -535,7 +535,7 @@ do { \
535535
* 32 bit must fall back to generic operations.
536536
*/
537537
#ifdef CONFIG_X86_64
538-
#define this_cpu_read_stable_8(pcp) percpu_stable_op(8, "mov", pcp)
538+
#define this_cpu_read_stable_8(pcp) __raw_cpu_read_stable(8, pcp)
539539

540540
#define raw_cpu_add_8(pcp, val) percpu_add_op(8, , (pcp), val)
541541
#define raw_cpu_and_8(pcp, val) percpu_binary_op(8, , "and", (pcp), val)

0 commit comments

Comments
 (0)