diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2018-06-08 10:09:28 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-08 10:09:28 -0300 |
commit | 5b5a04065fb5487303869fd6080c30f86530005d (patch) | |
tree | d1442504baf73be22d9e6bc1864206df5ccedfeb /kernel/time/timer.c | |
parent | 0e674a64b86e2bb00ab43f56104d3ea85dda0066 (diff) | |
parent | 8d99753ad93af6bcaf798232eeb15e60bdd7e94b (diff) |
Merge pull request #25 from MaxKrummenacher/4.9-1.0.x-imx-stable-merge
4.9 1.0.x imx stable merge
Diffstat (limited to 'kernel/time/timer.c')
-rw-r--r-- | kernel/time/timer.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 2d5cc7dfee14..7c477912f36d 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1884,6 +1884,12 @@ int timers_dead_cpu(unsigned int cpu) spin_lock_irq(&new_base->lock); spin_lock_nested(&old_base->lock, SINGLE_DEPTH_NESTING); + /* + * The current CPUs base clock might be stale. Update it + * before moving the timers over. + */ + forward_timer_base(new_base); + BUG_ON(old_base->running_timer); for (i = 0; i < WHEEL_SIZE; i++) |