aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2013-11-12 18:08:44 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-12 22:09:13 -0500
commit261adc9a609dbfde815337889b9e2c8728959ab8 (patch)
tree2286fd76839d591085b8770bba99e2fa5ec77d1d
parent81e41ea25b52ca8175ceb209438f14182a600d6d (diff)
jump_label: unlikely(x) > 0
if (unlikely(x) > 0) doesn't seem to help branch prediction Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Cc: Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Cc: "H. Peter Anvin" <hpa@linux.intel.com> Cc: Ingo Molnar <mingo@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/jump_label.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h
index a5079072da66..cf08540d6204 100644
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
@@ -132,14 +132,14 @@ static __always_inline void jump_label_init(void)
132 132
133static __always_inline bool static_key_false(struct static_key *key) 133static __always_inline bool static_key_false(struct static_key *key)
134{ 134{
135 if (unlikely(atomic_read(&key->enabled)) > 0) 135 if (unlikely(atomic_read(&key->enabled) > 0))
136 return true; 136 return true;
137 return false; 137 return false;
138} 138}
139 139
140static __always_inline bool static_key_true(struct static_key *key) 140static __always_inline bool static_key_true(struct static_key *key)
141{ 141{
142 if (likely(atomic_read(&key->enabled)) > 0) 142 if (likely(atomic_read(&key->enabled) > 0))
143 return true; 143 return true;
144 return false; 144 return false;
145} 145}