aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/topology.c
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2021-01-14 10:36:59 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-01-27 11:55:13 +0100
commitf19c54317e1b41bad4a74fc27513bd4d692dea9f (patch)
treececaac34187f812b19c633a1030babc75d1d4db8 /arch/x86/kernel/cpu/topology.c
parentf5ee8afc19711e1dd7bacae23712e224c1b22ba4 (diff)
downloadkernel_replicant_linux-f19c54317e1b41bad4a74fc27513bd4d692dea9f.tar.gz
kernel_replicant_linux-f19c54317e1b41bad4a74fc27513bd4d692dea9f.tar.bz2
kernel_replicant_linux-f19c54317e1b41bad4a74fc27513bd4d692dea9f.zip
x86/topology: Make __max_die_per_package available unconditionally
commit 1eb8f690bcb565a6600f8b6dcc78f7b239ceba17 upstream. Move it outside of CONFIG_SMP in order to avoid ifdeffery at the usage sites. 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> Link: https://lkml.kernel.org/r/20210114111814.5346-1-bp@alien8.de Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/kernel/cpu/topology.c')
-rw-r--r--arch/x86/kernel/cpu/topology.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/topology.c b/arch/x86/kernel/cpu/topology.c
index d3a0791bc052..91288da29599 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;
EXPORT_SYMBOL(__max_die_per_package);
+#ifdef CONFIG_SMP
/*
* Check if given CPUID extended toplogy "leaf" is implemented
*/