Merge tag 'mac80211-for-davem-2016-07-06' of git://git.kernel.org/pub/scm/linux/kerne...

[cascardo/linux.git] / arch / x86 / platform / efi / efi_stub_64.S

diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
index 92723ae..cd95075 100644 (file)
--- a/arch/x86/platform/efi/efi_stub_64.S
+++ b/arch/x86/platform/efi/efi_stub_64.S
@@ -11,7 +11,6 @@
 #include <asm/msr.h>
 #include <asm/processor-flags.h>
 #include <asm/page_types.h>
-#include <asm/frame.h>
 
 #define SAVE_XMM                       \
        mov %rsp, %rax;                 \
@@ -40,10 +39,10 @@
        mov (%rsp), %rsp
 
 ENTRY(efi_call)
-       FRAME_BEGIN
+       pushq %rbp
+       movq %rsp, %rbp
        SAVE_XMM
-       mov (%rsp), %rax
-       mov 8(%rax), %rax
+       mov 16(%rbp), %rax
        subq $48, %rsp
        mov %r9, 32(%rsp)
        mov %rax, 40(%rsp)
@@ -53,6 +52,6 @@ ENTRY(efi_call)
        call *%rdi
        addq $48, %rsp
        RESTORE_XMM
-       FRAME_END
+       popq %rbp
        ret
 ENDPROC(efi_call)