Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / arch / x86 / boot / compressed / head_64.S

diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
index fbf4c32d0b62d9181a7784a20086b805baaa78af..b4a5d284391c278edf539c43ac665521ff3ed70c 100644 (file)
--- a/arch/x86/boot/compressed/head_64.S
+++ b/arch/x86/boot/compressed/head_64.S
@@ -243,65 +243,6 @@ ENTRY(startup_64)
         * that maps our entire kernel(text+data+bss+brk), zero page
         * and command line.
         */
-#ifdef CONFIG_EFI_STUB
-       /*
-        * The entry point for the PE/COFF executable is efi_pe_entry, so
-        * only legacy boot loaders will execute this jmp.
-        */
-       jmp     preferred_addr
-
-ENTRY(efi_pe_entry)
-       movq    %rcx, efi64_config(%rip)        /* Handle */
-       movq    %rdx, efi64_config+8(%rip) /* EFI System table pointer */
-
-       leaq    efi64_config(%rip), %rax
-       movq    %rax, efi_config(%rip)
-
-       call    1f
-1:     popq    %rbp
-       subq    $1b, %rbp
-
-       /*
-        * Relocate efi_config->call().
-        */
-       addq    %rbp, efi64_config+40(%rip)
-
-       movq    %rax, %rdi
-       call    make_boot_params
-       cmpq    $0,%rax
-       je      fail
-       mov     %rax, %rsi
-       leaq    startup_32(%rip), %rax
-       movl    %eax, BP_code32_start(%rsi)
-       jmp     2f              /* Skip the relocation */
-
-handover_entry:
-       call    1f
-1:     popq    %rbp
-       subq    $1b, %rbp
-
-       /*
-        * Relocate efi_config->call().
-        */
-       movq    efi_config(%rip), %rax
-       addq    %rbp, 40(%rax)
-2:
-       movq    efi_config(%rip), %rdi
-       call    efi_main
-       movq    %rax,%rsi
-       cmpq    $0,%rax
-       jne     2f
-fail:
-       /* EFI init failed, so hang. */
-       hlt
-       jmp     fail
-2:
-       movl    BP_code32_start(%esi), %eax
-       leaq    preferred_addr(%rax), %rax
-       jmp     *%rax
-
-preferred_addr:
-#endif
 
        /* Setup data segments. */
        xorl    %eax, %eax
@@ -413,6 +354,59 @@ lvl5:
        jmp     *%rax
 
 #ifdef CONFIG_EFI_STUB
+
+/* The entry point for the PE/COFF executable is efi_pe_entry. */
+ENTRY(efi_pe_entry)
+       movq    %rcx, efi64_config(%rip)        /* Handle */
+       movq    %rdx, efi64_config+8(%rip) /* EFI System table pointer */
+
+       leaq    efi64_config(%rip), %rax
+       movq    %rax, efi_config(%rip)
+
+       call    1f
+1:     popq    %rbp
+       subq    $1b, %rbp
+
+       /*
+        * Relocate efi_config->call().
+        */
+       addq    %rbp, efi64_config+40(%rip)
+
+       movq    %rax, %rdi
+       call    make_boot_params
+       cmpq    $0,%rax
+       je      fail
+       mov     %rax, %rsi
+       leaq    startup_32(%rip), %rax
+       movl    %eax, BP_code32_start(%rsi)
+       jmp     2f              /* Skip the relocation */
+
+handover_entry:
+       call    1f
+1:     popq    %rbp
+       subq    $1b, %rbp
+
+       /*
+        * Relocate efi_config->call().
+        */
+       movq    efi_config(%rip), %rax
+       addq    %rbp, 40(%rax)
+2:
+       movq    efi_config(%rip), %rdi
+       call    efi_main
+       movq    %rax,%rsi
+       cmpq    $0,%rax
+       jne     2f
+fail:
+       /* EFI init failed, so hang. */
+       hlt
+       jmp     fail
+2:
+       movl    BP_code32_start(%esi), %eax
+       leaq    startup_64(%rax), %rax
+       jmp     *%rax
+ENDPROC(efi_pe_entry)
+
        .org 0x390
 ENTRY(efi64_stub_entry)
        movq    %rdi, efi64_config(%rip)        /* Handle */