Skip to content

Commit 0bab9cb

Browse files
committed
x86/entry: Remove put_ret_addr_in_rdi THUNK macro argument
That logic is unused since 320100a ("x86/entry: Remove the TRACE_IRQS cruft") Remove it. Suggested-by: Peter Zijlstra (Intel) <[email protected]> Acked-by: Peter Zijlstra (Intel) <[email protected]> Signed-off-by: Borislav Petkov <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent 5e6dca8 commit 0bab9cb

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

arch/x86/entry/thunk_64.S

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <asm/export.h>
1111

1212
/* rdi: arg1 ... normal C conventions. rax is saved/restored. */
13-
.macro THUNK name, func, put_ret_addr_in_rdi=0
13+
.macro THUNK name, func
1414
SYM_FUNC_START_NOALIGN(\name)
1515
pushq %rbp
1616
movq %rsp, %rbp
@@ -25,11 +25,6 @@ SYM_FUNC_START_NOALIGN(\name)
2525
pushq %r10
2626
pushq %r11
2727

28-
.if \put_ret_addr_in_rdi
29-
/* 8(%rbp) is return addr on stack */
30-
movq 8(%rbp), %rdi
31-
.endif
32-
3328
call \func
3429
jmp __thunk_restore
3530
SYM_FUNC_END(\name)

0 commit comments

Comments
 (0)