[RFC][PATCH 2/4] sched/clock: Update static_key usage

From	Peter Zijlstra <peterz@infradead.org>
Newsgroups	linux.kernel
Subject	[RFC][PATCH 2/4] sched/clock: Update static_key usage
Date	2016-12-15 14:20 +0100
Message-ID	<sOE6Z-6cE-1@gated-at.bofh.it> (permalink)
References	<sOE6Z-6cE-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

sched_clock was still using the deprecated static_key interface.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
 kernel/sched/clock.c |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

--- a/kernel/sched/clock.c
+++ b/kernel/sched/clock.c
@@ -78,19 +78,17 @@ EXPORT_SYMBOL_GPL(sched_clock);
 __read_mostly int sched_clock_running;
 
 #ifdef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
-static struct static_key __sched_clock_stable = STATIC_KEY_INIT;
+static DEFINE_STATIC_KEY_FALSE(__sched_clock_stable);
 static int __sched_clock_stable_early;
 
 int sched_clock_stable(void)
 {
-	return static_key_false(&__sched_clock_stable);
+	return static_branch_likely(&__sched_clock_stable);
 }
 
 static void __set_sched_clock_stable(void)
 {
-	if (!sched_clock_stable())
-		static_key_slow_inc(&__sched_clock_stable);
-
+	static_branch_enable(&__sched_clock_stable);
 	tick_dep_clear(TICK_DEP_BIT_CLOCK_UNSTABLE);
 }
 
@@ -109,9 +107,7 @@ void set_sched_clock_stable(void)
 static void __clear_sched_clock_stable(struct work_struct *work)
 {
 	/* XXX worry about clock continuity */
-	if (sched_clock_stable())
-		static_key_slow_dec(&__sched_clock_stable);
-
+	static_branch_disable(&__sched_clock_stable);
 	tick_dep_set(TICK_DEP_BIT_CLOCK_UNSTABLE);
 }

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[RFC][PATCH 2/4] sched/clock: Update static_key usage Peter Zijlstra <peterz@infradead.org> - 2016-12-15 14:20 +0100

csiph-web