diff options
author | Oren Twaig <oren@scalemp.com> | 2014-06-29 13:01:08 +0300 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2014-07-13 17:48:03 -0700 |
commit | 411cf9ee2946492c0ac7eca48422fcf94a723ce5 (patch) | |
tree | a151a728aaf0f631405f5a47ea534b0bffd65cf4 /arch/x86/include/asm/apic.h | |
parent | b81975eade8c6495f3c4d6746d22bdc95f617777 (diff) | |
download | linux-stable-411cf9ee2946492c0ac7eca48422fcf94a723ce5.tar.gz linux-stable-411cf9ee2946492c0ac7eca48422fcf94a723ce5.tar.bz2 linux-stable-411cf9ee2946492c0ac7eca48422fcf94a723ce5.zip |
x86, vsmp: Remove is_vsmp_box() from apic_is_clustered_box()
When a vSMP Foundation box is detected, the function apic_cluster_num() counts
the number of APIC clusters found. If more than one found, a multi board
configuration is assumed, and TSC marked as unstable. This behavior is
incorrect as vSMP Foundation may use processors from single node only, attached
to memory of other nodes - and such node may have more than one APIC cluster
(typically any recent intel box has more than single APIC_CLUSTERID(x)).
To fix this, we simply remove the code which detects a vSMP Foundation box and
affects apic_is_clusted_box() return value. This can be done because later the
kernel checks by itself if the TSC is stable using the
check_tsc_sync_[source|target]() functions and marks TSC as unstable if needed.
Acked-by: Shai Fultheim <shai@scalemp.com>
Signed-off-by: Oren Twaig <oren@scalemp.com>
Link: http://lkml.kernel.org/r/1404036068-11674-1-git-send-email-oren@scalemp.com
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/include/asm/apic.h')
-rw-r--r-- | arch/x86/include/asm/apic.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 69ed79aa9085..b40ea7e4bae9 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -85,14 +85,6 @@ static inline bool apic_from_smp_config(void) #include <asm/paravirt.h> #endif -#ifdef CONFIG_X86_64 -extern int is_vsmp_box(void); -#else -static inline int is_vsmp_box(void) -{ - return 0; -} -#endif extern int setup_profiling_timer(unsigned int); static inline void native_apic_mem_write(u32 reg, u32 v) |