Merge tag 'v3.8-rc6' into next/cleanup

Linux 3.8-rc6

1 files changed, 5 insertions, 3 deletions

diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
index aa4aaf1b2380..1e3184f6072f 100644
--- a/arch/x86/boot/compressed/head_32.S
+++ b/arch/x86/boot/compressed/head_32.S
@@ -35,11 +35,11 @@ ENTRY(startup_32)
 #ifdef CONFIG_EFI_STUB
         jmp     preferred_addr
 
-        .balign 0x10
         /*
          * We don't need the return address, so set up the stack so
-         * efi_main() can find its arugments.
+         * efi_main() can find its arguments.
          */
+ENTRY(efi_pe_entry)
         add     $0x4, %esp
 
         call    make_boot_params
@@ -50,8 +50,10 @@ ENTRY(startup_32)
         pushl   %eax
         pushl   %esi
         pushl   %ecx
+        sub     $0x4, %esp
 
-        .org 0x30,0x90
+ENTRY(efi_stub_entry)
+        add     $0x4, %esp
         call    efi_main
         cmpl    $0, %eax
         movl    %eax, %esi