locking updates
Subsystems (2)
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(-)
include/asm-generic/qrwlock_types.h +1 -0
@@ -3,6 +3,7 @@#define __ASM_GENERIC_QRWLOCK_TYPES_H#include <linux/types.h> +#include <asm/byteorder.h> #include <asm/spinlock_types.h> /*
include/linux/jump_label.h +2 -2
@@ -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 */