summaryrefslogtreecommitdiff
path: root/include/linux/once.h
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2017-10-10 00:30:52 +0300
committerDavid S. Miller <davem@davemloft.net>2017-10-10 06:26:23 +0300
commitcf4c950b87ee2f547ad3abd3aca6ae3f3eb3443f (patch)
treeec62d0b29fcd7361e4abb8cdc95042597571cf2c /include/linux/once.h
parentd93fa2ba64384a0bbee4ae7409d85fccb2cfcf14 (diff)
downloadlinux-cf4c950b87ee2f547ad3abd3aca6ae3f3eb3443f.tar.xz
once: switch to new jump label API
Switch the DO_ONCE() macro from the deprecated jump label API to the new one. The new one is more readable, and for DO_ONCE() it also makes the generated code more icache-friendly: now the one-time initialization code is placed out-of-line at the jump target, rather than at the inline fallthrough case. Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/once.h')
-rw-r--r--include/linux/once.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/once.h b/include/linux/once.h
index 9c98aaa87cbc..724724918e8b 100644
--- a/include/linux/once.h
+++ b/include/linux/once.h
@@ -5,7 +5,7 @@
#include <linux/jump_label.h>
bool __do_once_start(bool *done, unsigned long *flags);
-void __do_once_done(bool *done, struct static_key *once_key,
+void __do_once_done(bool *done, struct static_key_true *once_key,
unsigned long *flags);
/* Call a function exactly once. The idea of DO_ONCE() is to perform
@@ -38,8 +38,8 @@ void __do_once_done(bool *done, struct static_key *once_key,
({ \
bool ___ret = false; \
static bool ___done = false; \
- static struct static_key ___once_key = STATIC_KEY_INIT_TRUE; \
- if (static_key_true(&___once_key)) { \
+ static DEFINE_STATIC_KEY_TRUE(___once_key); \
+ if (static_branch_unlikely(&___once_key)) { \
unsigned long ___flags; \
___ret = __do_once_start(&___done, &___flags); \
if (unlikely(___ret)) { \