Messages in this thread Patch in this message | | | Date | Tue, 6 Feb 2018 21:23:34 +0100 | From | Ingo Molnar <> | Subject | [GIT PULL] locking updates |
| |
Linus,
Please pull the latest locking-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking-urgent-for-linus
# HEAD: ca66e797120fb09b8138623fb4b563e952586ef5 locking/qrwlock: include asm/byteorder.h as needed
An endianness fix and a jump labels branch hint update.
Thanks,
Ingo
------------------> Arnd Bergmann (1): locking/qrwlock: include asm/byteorder.h as needed
Peter Zijlstra (1): jump_label: Add branch hints to static_branch_{un,}likely()
include/asm-generic/qrwlock_types.h | 1 + include/linux/jump_label.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/asm-generic/qrwlock_types.h b/include/asm-generic/qrwlock_types.h index 137ecdd16daa..c36f1d5a2572 100644 --- a/include/asm-generic/qrwlock_types.h +++ b/include/asm-generic/qrwlock_types.h @@ -3,6 +3,7 @@ #define __ASM_GENERIC_QRWLOCK_TYPES_H #include <linux/types.h> +#include <asm/byteorder.h> #include <asm/spinlock_types.h> /* diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h index e0340ca08d98..b6a29c126cc4 100644 --- a/include/linux/jump_label.h +++ b/include/linux/jump_label.h @@ -393,7 +393,7 @@ extern bool ____wrong_branch_error(void); branch = !arch_static_branch_jump(&(x)->key, true); \ else \ branch = ____wrong_branch_error(); \ - branch; \ + likely(branch); \ }) #define static_branch_unlikely(x) \ @@ -405,7 +405,7 @@ extern bool ____wrong_branch_error(void); branch = arch_static_branch(&(x)->key, false); \ else \ branch = ____wrong_branch_error(); \ - branch; \ + unlikely(branch); \ }) #else /* !HAVE_JUMP_LABEL */
| |