x86/entry: Remove put_ret_addr_in_rdi THUNK macro argument
authorBorislav Petkov <bp@suse.de>
Thu, 14 Jan 2021 13:25:35 +0000 (14:25 +0100)
committerBorislav Petkov <bp@suse.de>
Tue, 19 Jan 2021 10:06:14 +0000 (11:06 +0100)
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
arch/x86/entry/thunk_64.S

index c9a9fbf1655f3ea0f5aafe954cd35e5af06e83b5..496b11ec469def7b22e0948b60f07d6f7746e1b6 100644 (file)
@@ -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)