diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-05-14 11:22:59 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-05-14 11:22:59 +0200 |
| commit | 4b96583869c4d990b779eca72976063970d41b8d (patch) | |
| tree | f2fdb7760a06f6445f33fdee3ec512fbdb46fcb4 /kernel/time/tick-common.c | |
| parent | 53667c670fe00d63246fb3cfb4480bb1ba247bcc (diff) | |
| parent | 67b8d5c7081221efa252e111cd52532ec6d4266f (diff) | |
| download | linux-next-4b96583869c4d990b779eca72976063970d41b8d.tar.gz | |
Merge tag 'v4.17-rc5' into irq/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/time/tick-common.c')
| -rw-r--r-- | kernel/time/tick-common.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c index 099572ca4a8f..49edc1c4f3e6 100644 --- a/kernel/time/tick-common.c +++ b/kernel/time/tick-common.c @@ -419,19 +419,6 @@ void tick_suspend_local(void) clockevents_shutdown(td->evtdev); } -static void tick_forward_next_period(void) -{ - ktime_t delta, now = ktime_get(); - u64 n; - - delta = ktime_sub(now, tick_next_period); - n = ktime_divns(delta, tick_period); - tick_next_period += n * tick_period; - if (tick_next_period < now) - tick_next_period += tick_period; - tick_sched_forward_next_period(); -} - /** * tick_resume_local - Resume the local tick device * @@ -444,8 +431,6 @@ void tick_resume_local(void) struct tick_device *td = this_cpu_ptr(&tick_cpu_device); bool broadcast = tick_resume_check_broadcast(); - tick_forward_next_period(); - clockevents_tick_resume(td->evtdev); if (!broadcast) { if (td->mode == TICKDEV_MODE_PERIODIC) |