--- v2
+++ v1
@@ -38,7 +38,7 @@
extern unsigned char real_mode_blob[];
extern unsigned char real_mode_relocs[];
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
-index 66b0573..a9ac31b 100644
+index 20a3de5..bd4c76c 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -38,9 +38,6 @@ DECLARE_EARLY_PER_CPU_READ_MOSTLY(u16, x86_bios_cpu_apicid);
@@ -65,7 +65,7 @@
(unsigned long)get_cpu_gdt_table(smp_processor_id());
initial_gs = per_cpu_offset(smp_processor_id());
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
-index 6770865..da840be 100644
+index 54cdbd2..60a16fc 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -94,7 +94,7 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
@@ -95,7 +95,7 @@
movl %eax,%ss
leal -__PAGE_OFFSET(%ecx),%esp
-@@ -709,7 +709,7 @@ ENTRY(initial_page_table)
+@@ -714,7 +714,7 @@ ENTRY(initial_page_table)
.data
.balign 4
@@ -105,10 +105,10 @@
__INITRODATA
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
-index 5df831e..792c3bb 100644
+index 22fbf9d..278270e 100644
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
-@@ -226,7 +226,7 @@ ENTRY(secondary_startup_64)
+@@ -217,7 +217,7 @@ ENTRY(secondary_startup_64)
movq %rax, %cr0
/* Setup a boot time stack */
@@ -117,7 +117,7 @@
/* zero EFLAGS after setting rsp */
pushq $0
-@@ -309,7 +309,7 @@ ENTRY(secondary_startup_64)
+@@ -300,7 +300,7 @@ ENTRY(secondary_startup_64)
* start_secondary().
*/
ENTRY(start_cpu0)
@@ -126,7 +126,7 @@
movq initial_code(%rip),%rax
pushq $0 # fake return address to stop unwinder
pushq $__KERNEL_CS # set correct cs
-@@ -318,17 +318,15 @@ ENTRY(start_cpu0)
+@@ -309,17 +309,15 @@ ENTRY(start_cpu0)
ENDPROC(start_cpu0)
#endif
@@ -147,7 +147,7 @@
bad_address:
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
-index 1fe4130..503682a 100644
+index b2c99f8..670f460 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -950,7 +950,7 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
@@ -160,4 +160,4 @@
/*
* Enable the espfix hack for this CPU
--
-2.4.11
+2.4.3