diff options
| author |   Frederic Weisbecker <fweisbec@gmail.com> | 2017-05-11 16:36:19 +0200 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2017-05-17 08:19:26 +0200 |
| commit | ce6cf9a15d62fd7ee92f4f9bb754883bacf85a3e (patch) | |
| tree | 215a81c09298ed726f3cf10db4ec4116d91e94a0 /kernel/time/tick-sched.c | |
| parent | Merge tag 'pstore-v4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux (diff) | |
| download | linux-dev-ce6cf9a15d62fd7ee92f4f9bb754883bacf85a3e.tar.xz linux-dev-ce6cf9a15d62fd7ee92f4f9bb754883bacf85a3e.zip | |
nohz: Add hrtimer sanity check
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/time/tick-sched.c')
| -rw-r--r-- | kernel/time/tick-sched.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 64c97fc130c4..d212bb62bc08 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -771,8 +771,13 @@ static ktime_t tick_nohz_stop_sched_tick(struct tick_sched *ts, tick = expires; /* Skip reprogram of event if its not changed */ - if (ts->tick_stopped && (expires == dev->next_event)) - goto out; + if (ts->tick_stopped) { + if (hrtimer_active(&ts->sched_timer)) + WARN_ON_ONCE(hrtimer_get_expires(&ts->sched_timer) < dev->next_event); + + if (expires == dev->next_event) + goto out; + } /* * nohz_stop_sched_tick can be called several times before |