Merge branch 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (821 commits)
  x86: make 64bit hpet_set_mapping to use ioremap too, v2
  x86: get x86_phys_bits early
  x86: max_low_pfn_mapped fix #4
  x86: change _node_to_cpumask_ptr to return const ptr
  x86: I/O APIC: remove an IRQ2-mask hack
  x86: fix numaq_tsc_disable calling
  x86, e820: remove end_user_pfn
  x86: max_low_pfn_mapped fix, #3
  x86: max_low_pfn_mapped fix, #2
  x86: max_low_pfn_mapped fix, #1
  x86_64: fix delayed signals
  x86: remove conflicting nx6325 and nx6125 quirks
  x86: Recover timer_ack lost in the merge of the NMI watchdog
  x86: I/O APIC: Never configure IRQ2
  x86: L-APIC: Always fully configure IRQ0
  x86: L-APIC: Set IRQ0 as edge-triggered
  x86: merge dwarf2 headers
  x86: use AS_CFI instead of UNWIND_INFO
  x86: use ignore macro instead of hash comment
  x86: use matching CFI_ENDPROC
  ...

1 files changed, 11 insertions, 2 deletions

diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index f7357cc0162c..f67e93441caf 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -194,6 +194,7 @@ default_entry:
         xorl %ebx,%ebx                          /* %ebx is kept at zero */
 
         movl $pa(pg0), %edi
+        movl %edi, pa(init_pg_tables_start)
         movl $pa(swapper_pg_pmd), %edx
         movl $PTE_ATTR, %eax
 10:
@@ -219,6 +220,8 @@ default_entry:
         jb 10b
 1:
         movl %edi,pa(init_pg_tables_end)
+        shrl $12, %eax
+        movl %eax, pa(max_pfn_mapped)
 
         /* Do early initialization of the fixmap area */
         movl $pa(swapper_pg_fixmap)+PDE_ATTR,%eax
@@ -228,6 +231,7 @@ default_entry:
 page_pde_offset = (__PAGE_OFFSET >> 20);
 
         movl $pa(pg0), %edi
+        movl %edi, pa(init_pg_tables_start)
         movl $pa(swapper_pg_dir), %edx
         movl $PTE_ATTR, %eax
 10:
@@ -249,6 +253,8 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
         cmpl %ebp,%eax
         jb 10b
         movl %edi,pa(init_pg_tables_end)
+        shrl $12, %eax
+        movl %eax, pa(max_pfn_mapped)
 
         /* Do early initialization of the fixmap area */
         movl $pa(swapper_pg_fixmap)+PDE_ATTR,%eax
@@ -446,10 +452,13 @@ is386:	movl $2,%ecx		# set MP
         je   1f
         movl $(__KERNEL_PERCPU), %eax
         movl %eax,%fs           # set this cpu's percpu
-        jmp initialize_secondary # all other CPUs call initialize_secondary
+        movl (stack_start), %esp
 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.