diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-03-21 09:47:40 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-03-21 09:47:40 (GMT) |
commit | 42e405f7b1d252c90a2468dd2140f47b8142b7a0 (patch) | |
tree | baeda52d8726fe694d3344a0d0fda1dadc30a901 /kernel/sched/clock.c | |
parent | e9532e69b8d1d1284e8ecf8d2586de34aec61244 (diff) | |
parent | 710d60cbf1b312a8075a2158cbfbbd9c66132dcc (diff) | |
download | linux-42e405f7b1d252c90a2468dd2140f47b8142b7a0.tar.xz |
Merge branch 'linus' into sched/urgent, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/clock.c')
-rw-r--r-- | kernel/sched/clock.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/sched/clock.c b/kernel/sched/clock.c index bc54e84..fedb967 100644 --- a/kernel/sched/clock.c +++ b/kernel/sched/clock.c @@ -61,6 +61,7 @@ #include <linux/static_key.h> #include <linux/workqueue.h> #include <linux/compiler.h> +#include <linux/tick.h> /* * Scheduler clock - returns current time in nanosec units. @@ -89,6 +90,8 @@ static void __set_sched_clock_stable(void) { if (!sched_clock_stable()) static_key_slow_inc(&__sched_clock_stable); + + tick_dep_clear(TICK_DEP_BIT_CLOCK_UNSTABLE); } void set_sched_clock_stable(void) @@ -108,6 +111,8 @@ 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); + + tick_dep_set(TICK_DEP_BIT_CLOCK_UNSTABLE); } static DECLARE_WORK(sched_clock_work, __clear_sched_clock_stable); |