x86, build: Dynamically find entry points in compressed startup code

[deliverable/linux.git] / arch / x86 / boot / compressed / head_32.S

diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
index ccb2f4a5f7bda805a18f65b1ceb07fb16635156f..1e3184f6072f913250b3b18371978a4fd1b3f63d 100644 (file)
--- 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
@@ -52,7 +52,7 @@ ENTRY(startup_32)
        pushl   %ecx
        sub     $0x4, %esp
 
-       .org 0x30,0x90
+ENTRY(efi_stub_entry)
        add     $0x4, %esp
        call    efi_main
        cmpl    $0, %eax