From: "tip-bot2 for Borislav Petkov" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>,
Borislav Petkov <bp@suse.de>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/entry] x86/entry: Remove put_ret_addr_in_rdi THUNK macro argument
Date: Tue, 19 Jan 2021 10:12:43 -0000 [thread overview]
Message-ID: <161105116343.414.12774166706996994964.tip-bot2@tip-bot2> (raw)
In-Reply-To: <YAAszZJ2GcIYZmB5@hirez.programming.kicks-ass.net>
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@suse.de>
AuthorDate: Thu, 14 Jan 2021 14:25:35 +01:00
Committer: Borislav Petkov <bp@suse.de>
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@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 | 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)
next prev parent reply other threads:[~2021-01-19 10:39 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-23 23:21 [PATCH] x86/entry: use STB_GLOBAL for register restoring thunk Nick Desaulniers
2020-12-24 4:55 ` Josh Poimboeuf
2021-01-06 0:43 ` [PATCH v2] " Nick Desaulniers
2021-01-06 1:58 ` Josh Poimboeuf
2021-01-11 20:38 ` [PATCH v3] x86/entry: emit a symbol " Nick Desaulniers
2021-01-11 20:58 ` Fangrui Song
2021-01-11 22:09 ` Josh Poimboeuf
2021-01-11 22:16 ` Fāng-ruì Sòng
2021-01-11 22:12 ` Josh Poimboeuf
2021-01-12 0:38 ` Borislav Petkov
2021-01-12 0:41 ` Fāng-ruì Sòng
2021-01-12 1:00 ` Borislav Petkov
2021-01-12 1:13 ` Nick Desaulniers
2021-01-12 1:59 ` Josh Poimboeuf
2021-01-12 11:54 ` Borislav Petkov
2021-01-12 19:46 ` [PATCH v4] " Nick Desaulniers
2021-01-12 21:01 ` Mark Brown
2021-01-13 16:59 ` Josh Poimboeuf
2021-01-13 17:46 ` [PATCH] Documentation: asm-annotation: clarify .L local symbol names Nick Desaulniers
2021-01-13 19:56 ` Mark Brown
2021-01-13 17:56 ` [PATCH v4] x86/entry: emit a symbol for register restoring thunk Nick Desaulniers
2021-01-14 10:39 ` Borislav Petkov
2021-01-14 11:36 ` Peter Zijlstra
2021-01-14 13:28 ` [PATCH] x86/entry: Remove put_ret_addr_in_rdi THUNK macro argument Borislav Petkov
2021-01-14 15:53 ` Peter Zijlstra
2021-01-19 10:12 ` tip-bot2 for Borislav Petkov [this message]
2021-01-14 15:14 ` [PATCH v4] x86/entry: emit a symbol for register restoring thunk Josh Poimboeuf
2021-01-13 11:52 ` [tip: x86/entry] x86/entry: Emit " tip-bot2 for Nick Desaulniers
2021-01-19 10:12 ` tip-bot2 for Nick Desaulniers
2021-01-12 11:47 ` [PATCH v3] x86/entry: emit " Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=161105116343.414.12774166706996994964.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).