summaryrefslogtreecommitdiffstats
path: root/arch/x86/entry
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2021-01-14 14:25:35 +0100
committerBorislav Petkov <bp@suse.de>2021-01-19 11:06:14 +0100
commit0bab9cb2d980d7c075cffb9216155f7835237f98 (patch)
treec522d0766fa3a5314679773783e0694fdfa1f4ec /arch/x86/entry
parent5e6dca82bcaa49348f9e5fcb48df4881f6d6c4ae (diff)
downloadlinux-stable-0bab9cb2d980d7c075cffb9216155f7835237f98.tar.gz
linux-stable-0bab9cb2d980d7c075cffb9216155f7835237f98.tar.bz2
linux-stable-0bab9cb2d980d7c075cffb9216155f7835237f98.zip
x86/entry: Remove put_ret_addr_in_rdi THUNK macro argument
That logic is unused since 320100a5ffe5 ("x86/entry: Remove the TRACE_IRQS cruft") Remove it. Suggested-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Borislav Petkov <bp@suse.de> Link: https://lkml.kernel.org/r/YAAszZJ2GcIYZmB5@hirez.programming.kicks-ass.net
Diffstat (limited to 'arch/x86/entry')
-rw-r--r--arch/x86/entry/thunk_64.S7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86/entry/thunk_64.S b/arch/x86/entry/thunk_64.S
index c9a9fbf1655f..496b11ec469d 100644
--- a/arch/x86/entry/thunk_64.S
+++ b/arch/x86/entry/thunk_64.S
@@ -10,7 +10,7 @@
#include <asm/export.h>
/* rdi: arg1 ... normal C conventions. rax is saved/restored. */
- .macro THUNK name, func, put_ret_addr_in_rdi=0
+ .macro THUNK name, func
SYM_FUNC_START_NOALIGN(\name)
pushq %rbp
movq %rsp, %rbp
@@ -25,11 +25,6 @@ SYM_FUNC_START_NOALIGN(\name)
pushq %r10
pushq %r11
- .if \put_ret_addr_in_rdi
- /* 8(%rbp) is return addr on stack */
- movq 8(%rbp), %rdi
- .endif
-
call \func
jmp __thunk_restore
SYM_FUNC_END(\name)