From 7e99b12d5f31c75b7f5bd244a4224e58d0683623 Mon Sep 17 00:00:00 2001
From: Alexey Starikovskiy <astarikovskiy@suse.de>
Date: Thu, 27 Mar 2008 23:54:06 +0300
Subject: [PATCH] --- yaml --- r: 89081 b: refs/heads/master c:
 987dd2d4d465e80e00d6a0b16787a78aa75dd66a h: refs/heads/master i:   89079:
 cec7d6406376c0c0fded4fd1e08d9e8b7dde38e1 v: v3

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

diff --git a/[refs] b/[refs]
index a41784478898..cb38a049c202 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2df297261903249f5ac2d3d14ededbda229397e2
+refs/heads/master: 987dd2d4d465e80e00d6a0b16787a78aa75dd66a
diff --git a/trunk/arch/x86/kernel/mpparse_32.c b/trunk/arch/x86/kernel/mpparse_32.c
index 4cc325edc70d..c487bc99d7a3 100644
--- a/trunk/arch/x86/kernel/mpparse_32.c
+++ b/trunk/arch/x86/kernel/mpparse_32.c
@@ -895,6 +895,10 @@ void __cpuinit mp_register_lapic (u8 id, u8 enabled)
 			id, MAX_APICS);
 		return;
 	}
+	if (!enabled) {
+		++disabled_cpus;
+		return;
+	}
 
 	if (id == boot_cpu_physical_apicid)
 		boot_cpu = 1;