Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar:
 "Misc fixes: EFI, entry code, pkeys and MPX fixes, TASK_SIZE cleanups
  and a tsc frequency table fix"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Switch from TASK_SIZE to TASK_SIZE_MAX in the page fault code
  x86/fsgsbase/64: Use TASK_SIZE_MAX for FSBASE/GSBASE upper limits
  x86/mm/mpx: Work around MPX erratum SKD046
  x86/entry/64: Fix stack return address retrieval in thunk
  x86/efi: Fix 7-parameter efi_call()s
  x86/cpufeature, x86/mm/pkeys: Fix broken compile-time disabling of pkeys
  x86/tsc: Add missing Cherrytrail frequency to the table

1 files changed, 5 insertions, 6 deletions

diff --git a/arch/x86/entry/thunk_64.S b/arch/x86/entry/thunk_64.S
index 98df1fa8825c..027aec4a74df 100644
--- a/arch/x86/entry/thunk_64.S
+++ b/arch/x86/entry/thunk_64.S
@@ -8,16 +8,15 @@
 #include <linux/linkage.h>
 #include "calling.h"
 #include <asm/asm.h>
-#include <asm/frame.h>
 
         /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
         .macro THUNK name, func, put_ret_addr_in_rdi=0
         .globl \name
         .type \name, @function
 \name:
-        FRAME_BEGIN
+        pushq %rbp
+        movq %rsp, %rbp
 
-        /* this one pushes 9 elems, the next one would be %rIP */
         pushq %rdi
         pushq %rsi
         pushq %rdx
@@ -29,8 +28,8 @@
         pushq %r11
 
         .if \put_ret_addr_in_rdi
-        /* 9*8(%rsp) is return addr on stack */
-        movq 9*8(%rsp), %rdi
+        /* 8(%rbp) is return addr on stack */
+        movq 8(%rbp), %rdi
         .endif
 
         call \func
@@ -65,7 +64,7 @@ restore:
         popq %rdx
         popq %rsi
         popq %rdi
-        FRAME_END
+        popq %rbp
         ret
         _ASM_NOKPROBE(restore)
 #endif