1 files changed, 19 insertions, 16 deletions

diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c
index 3751bb44961b..8f767d9aa45d 100644
--- a/arch/i386/kernel/mpparse.c
+++ b/arch/i386/kernel/mpparse.c
@@ -182,17 +182,6 @@ static void __devinit MP_processor_info (struct mpc_config_processor *m)
                 boot_cpu_physical_apicid = m->mpc_apicid;
         }
 
-        if (num_processors >= NR_CPUS) {
-                printk(KERN_WARNING "WARNING: NR_CPUS limit of %i reached."
-                        "  Processor ignored.\n", NR_CPUS); 
-                return;
-        }
-
-        if (num_processors >= maxcpus) {
-                printk(KERN_WARNING "WARNING: maxcpus limit of %i reached."
-                        " Processor ignored.\n", maxcpus); 
-                return;
-        }
         ver = m->mpc_apicver;
 
         if (!MP_valid_apicid(apicid, ver)) {
@@ -201,11 +190,6 @@ static void __devinit MP_processor_info (struct mpc_config_processor *m)
                 return;
         }
 
-        cpu_set(num_processors, cpu_possible_map);
-        num_processors++;
-        phys_cpu = apicid_to_cpu_present(apicid);
-        physids_or(phys_cpu_present_map, phys_cpu_present_map, phys_cpu);
-
         /*
          * Validate version
          */
@@ -216,6 +200,25 @@ static void __devinit MP_processor_info (struct mpc_config_processor *m)
                 ver = 0x10;
         }
         apic_version[m->mpc_apicid] = ver;
+
+        phys_cpu = apicid_to_cpu_present(apicid);
+        physids_or(phys_cpu_present_map, phys_cpu_present_map, phys_cpu);
+
+        if (num_processors >= NR_CPUS) {
+                printk(KERN_WARNING "WARNING: NR_CPUS limit of %i reached."
+                        "  Processor ignored.\n", NR_CPUS);
+                return;
+        }
+
+        if (num_processors >= maxcpus) {
+                printk(KERN_WARNING "WARNING: maxcpus limit of %i reached."
+                        " Processor ignored.\n", maxcpus);
+                return;
+        }
+
+        cpu_set(num_processors, cpu_possible_map);
+        num_processors++;
+
         if ((num_processors > 8) &&
             APIC_XAPIC(ver) &&
             (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL))