From 05d4619708b588b1a12f62579531f9af1aa55bd3 Mon Sep 17 00:00:00 2001
From: Alexey Starikovskiy <astarikovskiy@suse.de>
Date: Fri, 21 Mar 2008 20:18:17 +0300
Subject: [PATCH] --- yaml --- r: 88911 b: refs/heads/master c:
 89bda4fccbd49f4b2bf59d0165391696037be856 h: refs/heads/master i:   88909:
 7244e71e768f9e8677b322ffc604b8877a67e05c   88907:
 b5af4d6fbb1d47c6c26e355a1f4f4b1c0c861045   88903:
 87ead845bc5c2acb9a863fd1dc2827538db6b9e5   88895:
 af395788ddc02a5f8a2018438b385a1b5c05ad36 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/kernel/mpparse_32.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b0f59455890a..030bbce25336 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa3f1f42b4efac84c459383218c20ab39e4df566
+refs/heads/master: 89bda4fccbd49f4b2bf59d0165391696037be856
diff --git a/trunk/arch/x86/kernel/mpparse_32.c b/trunk/arch/x86/kernel/mpparse_32.c
index 15265ee11f89..1b225cea5d7b 100644
--- a/trunk/arch/x86/kernel/mpparse_32.c
+++ b/trunk/arch/x86/kernel/mpparse_32.c
@@ -212,7 +212,6 @@ static void __cpuinit MP_processor_info (struct mpc_config_processor *m)
 		return;
 	}
 
-	cpu_set(num_processors, cpu_possible_map);
 	num_processors++;
 	cpus_complement(tmp_map, cpu_present_map);
 	cpu = first_cpu(tmp_map);
@@ -251,12 +250,13 @@ static void __cpuinit MP_processor_info (struct mpc_config_processor *m)
 		u16 *bios_cpu_apicid = x86_bios_cpu_apicid_early_ptr;
 
 		cpu_to_apicid[cpu] = m->mpc_apicid;
-		bios_cpu_apicid[num_processors - 1] = m->mpc_apicid;
+		bios_cpu_apicid[cpu] = m->mpc_apicid;
 	} else {
 		per_cpu(x86_cpu_to_apicid, cpu) = m->mpc_apicid;
 		per_cpu(x86_bios_cpu_apicid, cpu) = m->mpc_apicid;
 	}
 #endif
+	cpu_set(cpu, cpu_possible_map);
 	cpu_set(cpu, cpu_present_map);
 }