tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

x86/cpufeatures: Rename X86_CMPXCHG64 to X86_CX8

Replace X86_CMPXCHG64 with X86_CX8, as CX8 is the name of the CPUID
flag, thus to make it consistent with X86_FEATURE_CX8 defined in
<asm/cpufeatures.h>.

No functional change intended.

Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Signed-off-by: Xin Li (Intel) <xin@zytor.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20250228082338.73859-2-xin@zytor.com

authored by

H. Peter Anvin (Intel) and committed by
Borislav Petkov (AMD) 909639aa ab68d2e3

+11 -11
+1 -1
arch/x86/Kconfig
··· 133 133 select ARCH_SUPPORTS_AUTOFDO_CLANG 134 134 select ARCH_SUPPORTS_PROPELLER_CLANG if X86_64 135 135 select ARCH_USE_BUILTIN_BSWAP 136 - select ARCH_USE_CMPXCHG_LOCKREF if X86_CMPXCHG64 136 + select ARCH_USE_CMPXCHG_LOCKREF if X86_CX8 137 137 select ARCH_USE_MEMTEST 138 138 select ARCH_USE_QUEUED_RWLOCKS 139 139 select ARCH_USE_QUEUED_SPINLOCKS
+2 -2
arch/x86/Kconfig.cpu
··· 299 299 def_bool y 300 300 depends on MCRUSOE || MEFFICEON || MCYRIXIII || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC7 || MATOM || X86_64 301 301 302 - config X86_CMPXCHG64 302 + config X86_CX8 303 303 def_bool y 304 304 depends on X86_HAVE_PAE || M586TSC || M586MMX || MK6 || MK7 || MGEODEGX1 || MGEODE_LX 305 305 ··· 313 313 int 314 314 default "64" if X86_64 315 315 default "6" if X86_32 && (MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MEFFICEON || MATOM || MK7) 316 - default "5" if X86_32 && X86_CMPXCHG64 316 + default "5" if X86_32 && X86_CX8 317 317 default "4" 318 318 319 319 config X86_DEBUGCTLMSR
+1 -1
arch/x86/include/asm/asm-prototypes.h
··· 16 16 #include <asm/gsseg.h> 17 17 #include <asm/nospec-branch.h> 18 18 19 - #ifndef CONFIG_X86_CMPXCHG64 19 + #ifndef CONFIG_X86_CX8 20 20 extern void cmpxchg8b_emu(void); 21 21 #endif 22 22
+1 -1
arch/x86/include/asm/atomic64_32.h
··· 48 48 ATOMIC64_EXPORT(atomic64_##sym) 49 49 #endif 50 50 51 - #ifdef CONFIG_X86_CMPXCHG64 51 + #ifdef CONFIG_X86_CX8 52 52 #define __alternative_atomic64(f, g, out, in...) \ 53 53 asm volatile("call %c[func]" \ 54 54 : ALT_OUTPUT_SP(out) \
+1 -1
arch/x86/include/asm/cmpxchg_32.h
··· 69 69 return __arch_try_cmpxchg64(ptr, oldp, new,); 70 70 } 71 71 72 - #ifdef CONFIG_X86_CMPXCHG64 72 + #ifdef CONFIG_X86_CX8 73 73 74 74 #define arch_cmpxchg64 __cmpxchg64 75 75
+1 -1
arch/x86/include/asm/required-features.h
··· 23 23 # define NEED_PAE 0 24 24 #endif 25 25 26 - #ifdef CONFIG_X86_CMPXCHG64 26 + #ifdef CONFIG_X86_CX8 27 27 # define NEED_CX8 (1<<(X86_FEATURE_CX8 & 31)) 28 28 #else 29 29 # define NEED_CX8 0
+1 -1
arch/x86/lib/Makefile
··· 56 56 lib-y += string_32.o 57 57 lib-y += memmove_32.o 58 58 lib-y += cmpxchg8b_emu.o 59 - ifneq ($(CONFIG_X86_CMPXCHG64),y) 59 + ifneq ($(CONFIG_X86_CX8),y) 60 60 lib-y += atomic64_386_32.o 61 61 endif 62 62 else
+1 -1
arch/x86/lib/cmpxchg8b_emu.S
··· 7 7 8 8 .text 9 9 10 - #ifndef CONFIG_X86_CMPXCHG64 10 + #ifndef CONFIG_X86_CX8 11 11 12 12 /* 13 13 * Emulate 'cmpxchg8b (%esi)' on UP
+1 -1
lib/atomic64_test.c
··· 254 254 pr_info("passed for %s platform %s CX8 and %s SSE\n", 255 255 #ifdef CONFIG_X86_64 256 256 "x86-64", 257 - #elif defined(CONFIG_X86_CMPXCHG64) 257 + #elif defined(CONFIG_X86_CX8) 258 258 "i586+", 259 259 #else 260 260 "i386+",
+1 -1
tools/arch/x86/include/asm/required-features.h
··· 23 23 # define NEED_PAE 0 24 24 #endif 25 25 26 - #ifdef CONFIG_X86_CMPXCHG64 26 + #ifdef CONFIG_X86_CX8 27 27 # define NEED_CX8 (1<<(X86_FEATURE_CX8 & 31)) 28 28 #else 29 29 # define NEED_CX8 0