Skip to content

Commit d1b1782

Browse files
committed
Merge tag 'locking-urgent-2021-07-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 jump label fix from Thomas Gleixner: "A single fix for jump labels to prevent the compiler from agressive un-inlining which results in a section mismatch" * tag 'locking-urgent-2021-07-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: jump_labels: Mark __jump_label_transform() as __always_inlined to work around aggressive compiler un-inlining
2 parents e049597 + e48a12e commit d1b1782

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

arch/x86/kernel/jump_label.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,10 @@ __jump_label_patch(struct jump_entry *entry, enum jump_label_type type)
7979
return (struct jump_label_patch){.code = code, .size = size};
8080
}
8181

82-
static inline void __jump_label_transform(struct jump_entry *entry,
83-
enum jump_label_type type,
84-
int init)
82+
static __always_inline void
83+
__jump_label_transform(struct jump_entry *entry,
84+
enum jump_label_type type,
85+
int init)
8586
{
8687
const struct jump_label_patch jlp = __jump_label_patch(entry, type);
8788

0 commit comments

Comments
 (0)