From 6d536cad0d55e71442b6d65500f74eb85544269e Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Tue, 4 Mar 2025 18:34:36 +0100 Subject: x86/percpu: Fix __per_cpu_hot_end marker Make __per_cpu_hot_end marker point to the end of the percpu cache hot data, not to the end of the percpu cache hot section. This fixes CONFIG_MPENTIUM4 case where X86_L1_CACHE_SHIFT is set to 7 (128 bytes). Also update assert message accordingly. Reported-by: Ingo Molnar Signed-off-by: Uros Bizjak Signed-off-by: Ingo Molnar Cc: Brian Gerst Link: https://lore.kernel.org/r/20250304173455.89361-1-ubizjak@gmail.com Closes: https://lore.kernel.org/lkml/Z8a-NVJs-pm5W-mG@gmail.com/ --- include/asm-generic/vmlinux.lds.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include/asm-generic') diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index c4e8fac50254..4925441bc471 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -1072,9 +1072,8 @@ defined(CONFIG_AUTOFDO_CLANG) || defined(CONFIG_PROPELLER_CLANG) . = ALIGN(cacheline); \ __per_cpu_hot_start = .; \ *(SORT_BY_ALIGNMENT(.data..percpu..hot.*)) \ - __per_cpu_hot_pad = .; \ - . = ALIGN(cacheline); \ __per_cpu_hot_end = .; \ + . = ALIGN(cacheline); \ *(.data..percpu..read_mostly) \ . = ALIGN(cacheline); \ *(.data..percpu) \ -- cgit v1.2.3