aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-02-25 01:11:42 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2007-02-26 14:14:15 -0500
commit3494c16676a21e7e53e21b08a0a469a38df6dcfb (patch)
treed80452cfe2d109e10910afcf735b68d5de6ec67b /kernel/time
parent9e203bcc1051cac2a8b15c3ee9db4c0d05794abe (diff)
[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>
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/tick-common.c5
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)
77void tick_handle_periodic(struct clock_event_device *dev) 77void tick_handle_periodic(struct clock_event_device *dev)
78{ 78{
79 int cpu = smp_processor_id(); 79 int cpu = smp_processor_id();
80 ktime_t next;
80 81
81 tick_periodic(cpu); 82 tick_periodic(cpu);
82 83
@@ -86,12 +87,12 @@ void tick_handle_periodic(struct clock_event_device *dev)
86 * Setup the next period for devices, which do not have 87 * Setup the next period for devices, which do not have
87 * periodic mode: 88 * periodic mode:
88 */ 89 */
90 next = ktime_add(dev->next_event, tick_period);
89 for (;;) { 91 for (;;) {
90 ktime_t next = ktime_add(dev->next_event, tick_period);
91
92 if (!clockevents_program_event(dev, next, ktime_get())) 92 if (!clockevents_program_event(dev, next, ktime_get()))
93 return; 93 return;
94 tick_periodic(cpu); 94 tick_periodic(cpu);
95 next = ktime_add(next, tick_period);
95 } 96 }
96} 97}
97 98