[PATCH] Remove the assumption that the number of the sibling is 2

Thanks to Nick's domain patch, the kernel worked fine with
smp_num_siblings = 4 (in simulation).

diff --git a/arch/i386/kernel/cpu/intel.c b/arch/i386/kernel/cpu/intel.c
index c7e7125af2cb7264eb127f18e302a7a9346421b0..444bc32513aa418629b67587fb86a8dc6a657770 100644 (file)
--- a/arch/i386/kernel/cpu/intel.c
+++ b/arch/i386/kernel/cpu/intel.c
@@ -296,12 +296,8 @@ static void __init init_intel(struct cpuinfo_x86 *c)
                } else if (smp_num_siblings > 1 ) {
                        index_lsb = 0;
                        index_msb = 31;
-                       /*
-                        * At this point we only support two siblings per
-                        * processor package.
-                        */
-#define NR_SIBLINGS    2
-                       if (smp_num_siblings != NR_SIBLINGS) {
+
+                       if (smp_num_siblings > NR_CPUS) {
                                printk(KERN_WARNING "CPU: Unsupported number of the siblings %d", smp_num_siblings);
                                smp_num_siblings = 1;
                                goto too_many_siblings;