summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorNikhil P Rao <nikhil.rao@intel.com>2011-05-25 10:18:41 -0700
committerIngo Molnar <mingo@elte.hu>2011-05-25 23:01:08 +0200
commit8b27f2ff7a24f0735c96055e676872f05398d99b (patch)
tree0625fa8ee1323e78cdde3588d04b62a2fce2107c /arch/x86
parentaf6a25f0e1ec0265c267e6ee4513925eaba6d0ed (diff)
downloadlinux-stable-8b27f2ff7a24f0735c96055e676872f05398d99b.tar.gz
linux-stable-8b27f2ff7a24f0735c96055e676872f05398d99b.tar.bz2
linux-stable-8b27f2ff7a24f0735c96055e676872f05398d99b.zip
x86: Remove unnecessary check in detect_ht()
This patch removes a check that causes incorrect scheduler domain setup (SMP instead of SMT) and bootlog warning messages when cpuid extensions for topology enumeration are not supported and the number of processors reported to the OS is smaller than smp_num_siblings. Acked-by: Suresh Siddha <suresh.b.siddha@intel.com> Signed-off-by: Nikhil P Rao <nikhil.rao@intel.com> Link: http://lkml.kernel.org/r/1306343921.19325.1.camel@fedora13 Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/cpu/common.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index c8b41623377f..53f02f5d8cce 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -477,13 +477,6 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c)
if (smp_num_siblings <= 1)
goto out;
- if (smp_num_siblings > nr_cpu_ids) {
- pr_warning("CPU: Unsupported number of siblings %d",
- smp_num_siblings);
- smp_num_siblings = 1;
- return;
- }
-
index_msb = get_count_order(smp_num_siblings);
c->phys_proc_id = apic->phys_pkg_id(c->initial_apicid, index_msb);