Commit d1b17825 authored by Linus Torvalds's avatar Linus Torvalds

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
parents e049597e e48a12e5
...@@ -79,7 +79,8 @@ __jump_label_patch(struct jump_entry *entry, enum jump_label_type type) ...@@ -79,7 +79,8 @@ __jump_label_patch(struct jump_entry *entry, enum jump_label_type type)
return (struct jump_label_patch){.code = code, .size = size}; return (struct jump_label_patch){.code = code, .size = size};
} }
static inline void __jump_label_transform(struct jump_entry *entry, static __always_inline void
__jump_label_transform(struct jump_entry *entry,
enum jump_label_type type, enum jump_label_type type,
int init) int init)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment