[tip: x86/entry] x86/entry: Remove put_ret_addr_in_rdi THUNK macro argument

From: tip-bot2 for Borislav Petkov
Date: Tue Jan 19 2021 - 05:39:46 EST


The following commit has been merged into the x86/entry branch of tip:

Commit-ID: 0bab9cb2d980d7c075cffb9216155f7835237f98
Gitweb: https://git.kernel.org/tip/0bab9cb2d980d7c075cffb9216155f7835237f98
Author: Borislav Petkov <bp@xxxxxxx>
AuthorDate: Thu, 14 Jan 2021 14:25:35 +01:00
Committer: Borislav Petkov <bp@xxxxxxx>
CommitterDate: Tue, 19 Jan 2021 11:06:14 +01:00

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@xxxxxxxxxxxxx>
Acked-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Link: https://lkml.kernel.org/r/YAAszZJ2GcIYZmB5@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
---
arch/x86/entry/thunk_64.S | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/arch/x86/entry/thunk_64.S b/arch/x86/entry/thunk_64.S
index c9a9fbf..496b11e 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)