From a94a7b1939369005dee8004f839b116b6518656c Mon Sep 17 00:00:00 2001 From: Nikhil P Rao Date: Wed, 25 May 2011 10:18:41 -0700 Subject: [PATCH] --- yaml --- r: 252691 b: refs/heads/master c: 8b27f2ff7a24f0735c96055e676872f05398d99b h: refs/heads/master i: 252689: 80986d6e5022c391c64941e57b1874be16e6821e 252687: 4f6cc4fe7a99dca19c779a559113e54f4ff73837 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/common.c | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index bec4b0f50b76..e1ff26e07171 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af6a25f0e1ec0265c267e6ee4513925eaba6d0ed +refs/heads/master: 8b27f2ff7a24f0735c96055e676872f05398d99b diff --git a/trunk/arch/x86/kernel/cpu/common.c b/trunk/arch/x86/kernel/cpu/common.c index c8b41623377f..53f02f5d8cce 100644 --- a/trunk/arch/x86/kernel/cpu/common.c +++ b/trunk/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);