From eead1ddcbb9b9423b04871b6d96b748e2baebe6a Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@hellion.org.uk>
Date: Wed, 30 Jan 2008 13:33:27 +0100
Subject: [PATCH] --- yaml --- r: 80373 b: refs/heads/master c:
 503595010f2024b236fd2636a7318fe64c794d6c h: refs/heads/master i:   80371:
 b9c6cbd09dd74235e37e3952bb8319407910e73f v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/head_32.S | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index da9ec62c248e..97b44ba3a3d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4323838215184f5a2f081e0d17b8d60731b03164
+refs/heads/master: 503595010f2024b236fd2636a7318fe64c794d6c
diff --git a/trunk/arch/x86/kernel/head_32.S b/trunk/arch/x86/kernel/head_32.S
index f409fe2a52e4..7b9b2566b7a8 100644
--- a/trunk/arch/x86/kernel/head_32.S
+++ b/trunk/arch/x86/kernel/head_32.S
@@ -199,7 +199,6 @@ default_entry:
 	addl $0x67, %eax			/* 0x67 == _PAGE_TABLE */
 	movl %eax, 4092(%edx)
 
-	xorl %ebx,%ebx				/* This is the boot CPU (BSP) */
 	jmp 3f
 /*
  * Non-boot CPU entry point; entered from trampoline.S
@@ -268,10 +267,6 @@ ENTRY(startup_32_smp)
 	wrmsr
 
 6:
-	/* This is a secondary processor (AP) */
-	xorl %ebx,%ebx
-	incl %ebx
-
 #endif /* CONFIG_SMP */
 3:
 
@@ -297,7 +292,7 @@ ENTRY(startup_32_smp)
 	popfl
 
 #ifdef CONFIG_SMP
-	andl %ebx,%ebx
+	cmpb $0, ready
 	jz  1f				/* Initial CPU cleans BSS */
 	jmp checkCPUtype
 1: