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.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Borislav Petkov <bp@suse.de>
Cc: Jason Baron <jbaron@akamai.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h
index e0340ca08d9897bd12ecdbb47454961c0237da82..b6a29c126cc49285f62995b59dc517f17cdc3af6 100644 (file)
--- 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 */