diff options
author | Nikhil P Rao <nikhil.rao@intel.com> | 2011-05-25 13:18:41 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-05-25 17:01:08 -0400 |
commit | 8b27f2ff7a24f0735c96055e676872f05398d99b (patch) | |
tree | 0625fa8ee1323e78cdde3588d04b62a2fce2107c | |
parent | af6a25f0e1ec0265c267e6ee4513925eaba6d0ed (diff) |
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>
-rw-r--r-- | arch/x86/kernel/cpu/common.c | 7 |
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) | |||
477 | if (smp_num_siblings <= 1) | 477 | if (smp_num_siblings <= 1) |
478 | goto out; | 478 | goto out; |
479 | 479 | ||
480 | if (smp_num_siblings > nr_cpu_ids) { | ||
481 | pr_warning("CPU: Unsupported number of siblings %d", | ||
482 | smp_num_siblings); | ||
483 | smp_num_siblings = 1; | ||
484 | return; | ||
485 | } | ||
486 | |||
487 | index_msb = get_count_order(smp_num_siblings); | 480 | index_msb = get_count_order(smp_num_siblings); |
488 | c->phys_proc_id = apic->phys_pkg_id(c->initial_apicid, index_msb); | 481 | c->phys_proc_id = apic->phys_pkg_id(c->initial_apicid, index_msb); |
489 | 482 | ||