diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-06 22:28:19 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-06 22:28:19 -0500 |
| commit | b3250aabfb068f43a24077a30945bda7adfeb619 (patch) | |
| tree | a4ce10778608cd467278622b617c0893253941f3 /include/linux | |
| parent | 0dc400f41f0d589a7d4defabdc537ec7e0640039 (diff) | |
| parent | ca66e797120fb09b8138623fb4b563e952586ef5 (diff) | |
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
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()
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/jump_label.h | 4 |
1 files changed, 2 insertions, 2 deletions
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); | |||
| 393 | branch = !arch_static_branch_jump(&(x)->key, true); \ | 393 | branch = !arch_static_branch_jump(&(x)->key, true); \ |
| 394 | else \ | 394 | else \ |
| 395 | branch = ____wrong_branch_error(); \ | 395 | branch = ____wrong_branch_error(); \ |
| 396 | branch; \ | 396 | likely(branch); \ |
| 397 | }) | 397 | }) |
| 398 | 398 | ||
| 399 | #define static_branch_unlikely(x) \ | 399 | #define static_branch_unlikely(x) \ |
| @@ -405,7 +405,7 @@ extern bool ____wrong_branch_error(void); | |||
| 405 | branch = arch_static_branch(&(x)->key, false); \ | 405 | branch = arch_static_branch(&(x)->key, false); \ |
| 406 | else \ | 406 | else \ |
| 407 | branch = ____wrong_branch_error(); \ | 407 | branch = ____wrong_branch_error(); \ |
| 408 | branch; \ | 408 | unlikely(branch); \ |
| 409 | }) | 409 | }) |
| 410 | 410 | ||
| 411 | #else /* !HAVE_JUMP_LABEL */ | 411 | #else /* !HAVE_JUMP_LABEL */ |