[TICK] tick-common: Fix one-shot handling in tick_handle_periodic().

When clockevents_program_event() is given an expire time in the
past, it does not update dev->next_event, so this looping code
would loop forever once the first in-the-past expiration time
was used.

Keep advancing "next" locally to fix this bug.

Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 2 deletions

diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
index 4500e347f1bb..0986a2bfab49 100644
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@ -77,6 +77,7 @@ static void tick_periodic(int cpu)
 void tick_handle_periodic(struct clock_event_device *dev)
 {
         int cpu = smp_processor_id();
+        ktime_t next;
 
         tick_periodic(cpu);
 
@@ -86,12 +87,12 @@ void tick_handle_periodic(struct clock_event_device *dev)
          * Setup the next period for devices, which do not have
          * periodic mode:
          */
+        next = ktime_add(dev->next_event, tick_period);
         for (;;) {
-                ktime_t next = ktime_add(dev->next_event, tick_period);
-
                 if (!clockevents_program_event(dev, next, ktime_get()))
                         return;
                 tick_periodic(cpu);
+                next = ktime_add(next, tick_period);
         }
 }