x86/topology: Make __max_die_per_package available unconditionally
diff mbox series

Message ID 20210114111814.5346-1-bp@alien8.de
State Accepted
Commit 1eb8f690bcb565a6600f8b6dcc78f7b239ceba17
Headers show
  • x86/topology: Make __max_die_per_package available unconditionally
Related show

Commit Message

Borislav Petkov Jan. 14, 2021, 11:18 a.m. UTC
From: Borislav Petkov <bp@suse.de>

Move it outside of CONFIG_SMP in order to avoid ifdeffery at the usage

Fixes: 76e2fc63ca40 ("x86/cpu/amd: Set __max_die_per_package on AMD")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
 arch/x86/include/asm/topology.h | 4 ++--
 arch/x86/kernel/cpu/topology.c  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff mbox series

diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h
index 488a8e848754..9239399e5491 100644
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@ -110,6 +110,8 @@  extern const struct cpumask *cpu_coregroup_mask(int cpu);
 #define topology_die_id(cpu)			(cpu_data(cpu).cpu_die_id)
 #define topology_core_id(cpu)			(cpu_data(cpu).cpu_core_id)
+extern unsigned int __max_die_per_package;
 #ifdef CONFIG_SMP
 #define topology_die_cpumask(cpu)		(per_cpu(cpu_die_map, cpu))
 #define topology_core_cpumask(cpu)		(per_cpu(cpu_core_map, cpu))
@@ -118,8 +120,6 @@  extern const struct cpumask *cpu_coregroup_mask(int cpu);
 extern unsigned int __max_logical_packages;
 #define topology_max_packages()			(__max_logical_packages)
-extern unsigned int __max_die_per_package;
 static inline int topology_max_die_per_package(void)
 	return __max_die_per_package;
diff --git a/arch/x86/kernel/cpu/topology.c b/arch/x86/kernel/cpu/topology.c
index 1068002c8532..8678864ce712 100644
--- a/arch/x86/kernel/cpu/topology.c
+++ b/arch/x86/kernel/cpu/topology.c
@@ -25,10 +25,10 @@ 
 #define BITS_SHIFT_NEXT_LEVEL(eax)	((eax) & 0x1f)
 #define LEVEL_MAX_SIBLINGS(ebx)		((ebx) & 0xffff)
-#ifdef CONFIG_SMP
 unsigned int __max_die_per_package __read_mostly = 1;
+#ifdef CONFIG_SMP
  * Check if given CPUID extended toplogy "leaf" is implemented