diff options
author | Andy Lutomirski <luto@kernel.org> | 2015-11-12 21:59:01 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-11-24 09:56:43 +0100 |
commit | ed11a7f1b3bd482bd7d6ef7bc2859c41fb43b9ee (patch) | |
tree | 35dbeb8917ca3b467a7f55325616ba6939501eb9 /kernel/context_tracking.c | |
parent | Merge branch 'x86/urgent' into x86/asm, to pick up dependent fixes (diff) | |
download | linux-ed11a7f1b3bd482bd7d6ef7bc2859c41fb43b9ee.tar.xz linux-ed11a7f1b3bd482bd7d6ef7bc2859c41fb43b9ee.zip |
context_tracking: Switch to new static_branch API
This is much less error-prone than the old code.
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/812df7e64f120c5c7c08481f36a8caa9f53b2199.1447361906.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/context_tracking.c')
-rw-r--r-- | kernel/context_tracking.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/context_tracking.c b/kernel/context_tracking.c index d8560ee3bab7..9ad37b9e44a7 100644 --- a/kernel/context_tracking.c +++ b/kernel/context_tracking.c @@ -24,7 +24,7 @@ #define CREATE_TRACE_POINTS #include <trace/events/context_tracking.h> -struct static_key context_tracking_enabled = STATIC_KEY_INIT_FALSE; +DEFINE_STATIC_KEY_FALSE(context_tracking_enabled); EXPORT_SYMBOL_GPL(context_tracking_enabled); DEFINE_PER_CPU(struct context_tracking, context_tracking); @@ -191,7 +191,7 @@ void __init context_tracking_cpu_set(int cpu) if (!per_cpu(context_tracking.active, cpu)) { per_cpu(context_tracking.active, cpu) = true; - static_key_slow_inc(&context_tracking_enabled); + static_branch_inc(&context_tracking_enabled); } if (initialized) |