[GIT pull] locking/urgent for v5.14-rc3

From: Thomas Gleixner
Date: Sun Jul 25 2021 - 05:23:23 EST


Linus,

please pull the latest locking/urgent branch from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking-urgent-2021-07-25

up to: e48a12e546ec: jump_labels: Mark __jump_label_transform() as __always_inlined to work around aggressive compiler un-inlining

A single fix for jump labels to prevent the compiler from agressive
un-inlining which results in a section mismatch.

Thanks,

tglx

------------------>
Ingo Molnar (1):
jump_labels: Mark __jump_label_transform() as __always_inlined to work around aggressive compiler un-inlining


arch/x86/kernel/jump_label.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
index 674906fad43b..68f091ba8443 100644
--- a/arch/x86/kernel/jump_label.c
+++ b/arch/x86/kernel/jump_label.c
@@ -79,9 +79,10 @@ __jump_label_patch(struct jump_entry *entry, enum jump_label_type type)
return (struct jump_label_patch){.code = code, .size = size};
}

-static inline void __jump_label_transform(struct jump_entry *entry,
- enum jump_label_type type,
- int init)
+static __always_inline void
+__jump_label_transform(struct jump_entry *entry,
+ enum jump_label_type type,
+ int init)
{
const struct jump_label_patch jlp = __jump_label_patch(entry, type);