]> git.karo-electronics.de Git - linux-beck.git/commitdiff
x86: Remove unnecessary check in detect_ht()
authorNikhil P Rao <nikhil.rao@intel.com>
Wed, 25 May 2011 17:18:41 +0000 (10:18 -0700)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 May 2011 21:01:08 +0000 (23:01 +0200)
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>
arch/x86/kernel/cpu/common.c

index c8b41623377f14462a248b245ffab97792e9409c..53f02f5d8cce121abd52bf76380afa4c05aaa2ce 100644 (file)
@@ -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);