iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse Source 
Pull locking fixlets from Ingo Molnar:
 "An endianness fix and a jump labels branch hint update"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/qrwlock: include asm/byteorder.h as needed
  jump_label: Add branch hints to static_branch_{un,}likely()
This commit is contained in:
Linus Torvalds
2018-02-06 19:28:19 -08:00
parent 0dc400f41f ca66e79712
commit b3250aabfb
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/asm-generic/qrwlock_types.h
View File

@@ -3,6 +3,7 @@
#define __ASM_GENERIC_QRWLOCK_TYPES_H #define __ASM_GENERIC_QRWLOCK_TYPES_H
#include <linux/types.h> #include <linux/types.h>
#include <asm/byteorder.h>
#include <asm/spinlock_types.h> #include <asm/spinlock_types.h>
/* /*

4
include/linux/jump_label.h
View File

@@ -393,7 +393,7 @@ extern bool ____wrong_branch_error(void);
branch = !arch_static_branch_jump(&(x)->key, true); \ branch = !arch_static_branch_jump(&(x)->key, true); \
else \ else \
branch = ____wrong_branch_error(); \ branch = ____wrong_branch_error(); \
branch; \ likely(branch); \
}) })
#define static_branch_unlikely(x) \ #define static_branch_unlikely(x) \
@@ -405,7 +405,7 @@ extern bool ____wrong_branch_error(void);
branch = arch_static_branch(&(x)->key, false); \ branch = arch_static_branch(&(x)->key, false); \
else \ else \
branch = ____wrong_branch_error(); \ branch = ____wrong_branch_error(); \
branch; \ unlikely(branch); \
}) })
#else /* !HAVE_JUMP_LABEL */ #else /* !HAVE_JUMP_LABEL */