Browse Source

clockevents: prevent endless loop in periodic broadcast handler

The reprogramming of the periodic broadcast handler was broken,
when the first programming returned -ETIME. The clockevents code
stores the new expiry value in the clock events device next_event field
only when the programming time has not been elapsed yet. The loop in
question calculates the new expiry value from the next_event value
and therefor never increases.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Thomas Gleixner 16 years ago
parent
commit
d4496b3955
1 changed files with 8 additions and 3 deletions
  1. 8 3
      kernel/time/tick-broadcast.c

+ 8 - 3
kernel/time/tick-broadcast.c

@@ -175,6 +175,8 @@ static void tick_do_periodic_broadcast(void)
  */
  */
 static void tick_handle_periodic_broadcast(struct clock_event_device *dev)
 static void tick_handle_periodic_broadcast(struct clock_event_device *dev)
 {
 {
+	ktime_t next;
+
 	tick_do_periodic_broadcast();
 	tick_do_periodic_broadcast();
 
 
 	/*
 	/*
@@ -185,10 +187,13 @@ static void tick_handle_periodic_broadcast(struct clock_event_device *dev)
 
 
 	/*
 	/*
 	 * Setup the next period for devices, which do not have
 	 * Setup the next period for devices, which do not have
-	 * periodic mode:
+	 * periodic mode. We read dev->next_event first and add to it
+	 * when the event alrady expired. clockevents_program_event()
+	 * sets dev->next_event only when the event is really
+	 * programmed to the device.
 	 */
 	 */
-	for (;;) {
-		ktime_t next = ktime_add(dev->next_event, tick_period);
+	for (next = dev->next_event; ;) {
+		next = ktime_add(next, tick_period);
 
 
 		if (!clockevents_program_event(dev, next, ktime_get()))
 		if (!clockevents_program_event(dev, next, ktime_get()))
 			return;
 			return;