The following commit has been merged into the x86/asm branch of tip: Commit-ID: 79165720f31868d9a9f7e5a50a09d5fe510d1822 Gitweb: https://git.kernel.org/tip/79165720f31868d9a9f7e5a50a09d5fe510d1822 Author: Uros Bizjak <ubizjak@xxxxxxxxx> AuthorDate: Tue, 25 Feb 2025 21:02:20 +01:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Tue, 25 Feb 2025 21:07:24 +01:00 x86/percpu: Construct __percpu_seg_override from __percpu_seg Construct __percpu_seg_override macro from __percpu_seg by concatenating the later with __seg_ prefix to reduce ifdeffery. No functional change intended. Signed-off-by: Uros Bizjak <ubizjak@xxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20250225200235.48007-1-ubizjak@xxxxxxxxx --- arch/x86/include/asm/percpu.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h index c2a9dfc..7cb4f64 100644 --- a/arch/x86/include/asm/percpu.h +++ b/arch/x86/include/asm/percpu.h @@ -22,6 +22,7 @@ #else /* !__ASSEMBLY__: */ +#include <linux/args.h> #include <linux/build_bug.h> #include <linux/stringify.h> #include <asm/asm.h> @@ -35,12 +36,7 @@ # define __seg_fs __attribute__((address_space(__seg_fs))) #endif -#ifdef CONFIG_X86_64 -# define __percpu_seg_override __seg_gs -#else -# define __percpu_seg_override __seg_fs -#endif - +#define __percpu_seg_override CONCATENATE(__seg_, __percpu_seg) #define __percpu_prefix "" #else /* !CONFIG_CC_HAS_NAMED_AS: */
|