diff options
| author | Ingo Molnar | 2017-02-14 07:29:14 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2017-02-14 07:29:14 +0100 |
| commit | 210f400d68a14bc89e2e61dc2e06cdd67cfeb5f6 (patch) | |
| tree | 2098a7db539f0e92676d8d953002db3cc8eb03b8 /kernel/time/tick-sched.c | |
| parent | perf/x86/intel: Add Kaby Lake support (diff) | |
| parent | Linux 4.10-rc8 (diff) | |
| download | kernel-qcow2-linux-210f400d68a14bc89e2e61dc2e06cdd67cfeb5f6.tar.gz kernel-qcow2-linux-210f400d68a14bc89e2e61dc2e06cdd67cfeb5f6.tar.xz kernel-qcow2-linux-210f400d68a14bc89e2e61dc2e06cdd67cfeb5f6.zip | |
Merge tag 'v4.10-rc8' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/time/tick-sched.c')
| -rw-r--r-- | kernel/time/tick-sched.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 74e0388cc88d..fc6f740d0277 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -725,6 +725,11 @@ static ktime_t tick_nohz_stop_sched_tick(struct tick_sched *ts, */ if (delta == 0) { tick_nohz_restart(ts, now); + /* + * Make sure next tick stop doesn't get fooled by past + * clock deadline + */ + ts->next_tick = 0; goto out; } } |