From: Glauber Costa <gcosta@redhat.com>
Date: Wed, 28 May 2008 15:57:02 +0000 (-0300)
Subject: x86: use initial_code for i386
X-Git-Tag: v2.6.27-rc1~1106^2~237
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e3f77edfc1d0beb7b10f9f31d9e39206f7dbef7b;p=linux-2.6-omap-h63xx.git

x86: use initial_code for i386

x86_64 jumps to whatever is written in "initial_code" symbol,
instead of a fixed address. Do it for i386 too. It will allow us
to integrate more of the smp boot code.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index b98b338aae1..ffb73a5b609 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -455,7 +455,10 @@ is386:	movl $2,%ecx		# set MP
 	jmp initialize_secondary # all other CPUs call initialize_secondary
 1:
 #endif /* CONFIG_SMP */
-	jmp i386_start_kernel
+	jmp *(initial_code)
+.align 4
+ENTRY(initial_code)
+	.long i386_start_kernel
 
 /*
  * We depend on ET to be correct. This checks for 287/387.