[PATCH] x86_64: Move cpu_present/possible_map parsing earlier

Various code needs this information now before the actual SMP bootup.  Instead
of computing it on the fly while booting the other CPUs set it up now while
initial MPtable/MADT parsing.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 11 insertions, 6 deletions

diff --git a/arch/x86_64/kernel/mpparse.c b/arch/x86_64/kernel/mpparse.c
index 9c5aa2a790c7..08abf9f5b159 100644
--- a/arch/x86_64/kernel/mpparse.c
+++ b/arch/x86_64/kernel/mpparse.c
@@ -109,7 +109,7 @@ static int __init mpf_checksum(unsigned char *mp, int len)
 
 static void __init MP_processor_info (struct mpc_config_processor *m)
 {
-        int ver;
+        int ver, cpu;
         static int found_bsp=0;
 
         if (!(m->mpc_cpuflag & CPU_ENABLED))
@@ -131,7 +131,7 @@ static void __init MP_processor_info (struct mpc_config_processor *m)
                 return;
         }
 
-        num_processors++;
+        cpu = num_processors++;
 
         if (m->mpc_apicid > MAX_APICS) {
                 printk(KERN_ERR "Processor #%d INVALID. (Max ID: %d).\n",
@@ -155,13 +155,18 @@ static void __init MP_processor_info (struct mpc_config_processor *m)
                  * in same order as logical cpu numbers. Hence the first
                  * entry is BSP, and so on.
                  */
+                cpu = 0;
+
                 bios_cpu_apicid[0] = m->mpc_apicid;
                 x86_cpu_to_apicid[0] = m->mpc_apicid;
                 found_bsp = 1;
-        } else {
-                bios_cpu_apicid[num_processors - found_bsp] = m->mpc_apicid;
-                x86_cpu_to_apicid[num_processors - found_bsp] = m->mpc_apicid;
-        }
+        } else
+                cpu = num_processors - found_bsp;
+        bios_cpu_apicid[cpu] = m->mpc_apicid;
+        x86_cpu_to_apicid[cpu] = m->mpc_apicid;
+
+        cpu_set(cpu, cpu_possible_map);
+        cpu_set(cpu, cpu_present_map);
 }
 
 static void __init MP_bus_info (struct mpc_config_bus *m)