diff options
| author | Ingo Molnar <[email protected]> | 2018-03-06 07:30:22 +0100 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2018-03-06 07:30:22 +0100 |
| commit | 8af31363cda93724c237b6ffb24380f4441d2f8d (patch) | |
| tree | dc25d9ff94761b0adc9381aebd06c8e7f77884e3 /kernel/time/timer.c | |
| parent | ddc4becca1409541c2ebb7ecb99b5cef44cf17e4 (diff) | |
| parent | 661e50bc853209e41a5c14a290ca4decc43cbfd1 (diff) | |
Merge tag 'v4.16-rc4' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <[email protected]>
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 48150ab42de9..4a4fd567fb26 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1894,6 +1894,12 @@ int timers_dead_cpu(unsigned int cpu) raw_spin_lock_irq(&new_base->lock); raw_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++) |