From: "tip-bot2 for Josh Poimboeuf" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Josh Poimboeuf <jpoimboe@kernel.org>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: objtool/core] x86/linkage: Fix padding for typed functions
Date: Fri, 14 Apr 2023 14:47:54 -0000 [thread overview]
Message-ID: <168148367428.404.12784919569941633105.tip-bot2@tip-bot2> (raw)
In-Reply-To: <721f0da48d2a49fe907225711b8b76a2b787f9a8.1681331135.git.jpoimboe@kernel.org>
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 4a2c3448ed3d362431c249ec0eb0f90281804ea8
Gitweb: https://git.kernel.org/tip/4a2c3448ed3d362431c249ec0eb0f90281804ea8
Author: Josh Poimboeuf <jpoimboe@kernel.org>
AuthorDate: Wed, 12 Apr 2023 13:26:14 -07:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Fri, 14 Apr 2023 16:08:30 +02:00
x86/linkage: Fix padding for typed functions
CFI typed functions are failing to get padded properly for
CONFIG_CALL_PADDING.
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/721f0da48d2a49fe907225711b8b76a2b787f9a8.1681331135.git.jpoimboe@kernel.org
---
arch/x86/include/asm/linkage.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/linkage.h b/arch/x86/include/asm/linkage.h
index dd9b811..0953aa3 100644
--- a/arch/x86/include/asm/linkage.h
+++ b/arch/x86/include/asm/linkage.h
@@ -99,7 +99,7 @@
/* SYM_TYPED_FUNC_START -- use for indirectly called globals, w/ CFI type */
#define SYM_TYPED_FUNC_START(name) \
- SYM_TYPED_START(name, SYM_L_GLOBAL, SYM_A_ALIGN) \
+ SYM_TYPED_START(name, SYM_L_GLOBAL, SYM_F_ALIGN) \
ENDBR
/* SYM_FUNC_START -- use for global functions */
next prev parent reply other threads:[~2023-04-14 14:48 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-12 20:26 [PATCH 0/3] objtool: Generate ORC data for __pfx code Josh Poimboeuf
2023-04-12 20:26 ` [PATCH 1/3] objtool: Separate prefix code from stack validation code Josh Poimboeuf
2023-04-13 9:30 ` Peter Zijlstra
2023-04-13 15:27 ` Josh Poimboeuf
2023-04-14 14:47 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-04-12 20:26 ` [PATCH 2/3] x86/linkage: Fix padding for typed functions Josh Poimboeuf
2023-04-14 14:47 ` tip-bot2 for Josh Poimboeuf [this message]
2023-04-12 20:26 ` [PATCH 3/3] objtool: Generate ORC data for __pfx code Josh Poimboeuf
2023-04-13 11:23 ` Peter Zijlstra
2023-04-13 11:24 ` Peter Zijlstra
2023-04-13 15:29 ` Josh Poimboeuf
2023-04-13 19:24 ` Peter Zijlstra
2023-04-13 19:30 ` Josh Poimboeuf
2023-04-14 14:47 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
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=168148367428.404.12784919569941633105.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=jpoimboe@kernel.org \
--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
all inboxes | Powered by JetHome®