efi/libstub/x86: Avoid thunking for native firmware calls

[linux-2.6-microblaze.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 f2dfd6d..0b03dc7 100644 (file)
--- a/arch/x86/boot/compressed/head_32.S
+++ b/arch/x86/boot/compressed/head_32.S
@@ -161,9 +161,7 @@ SYM_FUNC_START(efi_pe_entry)
        popl    %ecx
        movl    %ecx, efi32_config+8(%esi)      /* EFI System table pointer */
 
-       /* Relocate efi_config->call() */
        leal    efi32_config(%esi), %eax
-       add     %esi, 40(%eax)
        pushl   %eax
 
        call    make_boot_params
@@ -188,9 +186,7 @@ SYM_FUNC_START(efi32_stub_entry)
        movl    %ecx, efi32_config(%esi)        /* Handle */
        movl    %edx, efi32_config+8(%esi)      /* EFI System table pointer */
 
-       /* Relocate efi_config->call() */
        leal    efi32_config(%esi), %eax
-       add     %esi, 40(%eax)
        pushl   %eax
 2:
        call    efi_main
@@ -266,8 +262,6 @@ SYM_FUNC_END(.Lrelocated)
        .data
 efi32_config:
        .fill 5,8,0
-       .long efi_call_phys
-       .long 0
        .byte 0
 #endif