| Date | Tue, 23 Jan 2018 16:25:48 +0100 | From | Peter Zijlstra <> | Subject | [PATCH 09/24] jump_label: Add branch hints to static_branch_{un,}likely() |
| |
For some reason these were missing, I've not observed this patch making a difference in the few code locations I checked, but this makes sense.
Cc: Jason Baron <jbaron@akamai.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> --- include/linux/jump_label.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
--- a/include/linux/jump_label.h +++ b/include/linux/jump_label.h @@ -388,7 +388,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) \ @@ -400,7 +400,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 */
|