AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

sched/clock: Update static_key usage

Browse Source 
sched_clock was still using the deprecated static_key interface.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
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>
This commit is contained in:
Peter Zijlstra 2016-12-15 13:21:58 +01:00 committed by Ingo Molnar
parent 12907fbb1a
commit 555570d744
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/sched/clock.c
View File

@ -78,19 +78,17 @@ EXPORT_SYMBOL_GPL(sched_clock);
__read_mostly int sched_clock_running; __read_mostly int sched_clock_running;
#ifdef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK #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; static int __sched_clock_stable_early;
int sched_clock_stable(void) 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) static void __set_sched_clock_stable(void)
{ {
if (!sched_clock_stable()) static_branch_enable(&__sched_clock_stable);
static_key_slow_inc(&__sched_clock_stable);
tick_dep_clear(TICK_DEP_BIT_CLOCK_UNSTABLE); 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) static void __clear_sched_clock_stable(struct work_struct *work)
{ {
/* XXX worry about clock continuity */ /* XXX worry about clock continuity */
if (sched_clock_stable()) static_branch_disable(&__sched_clock_stable);
static_key_slow_dec(&__sched_clock_stable);
tick_dep_set(TICK_DEP_BIT_CLOCK_UNSTABLE); tick_dep_set(TICK_DEP_BIT_CLOCK_UNSTABLE);
} }