aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-10-20 07:38:11 -0400
committerThomas Gleixner <tglx@linutronix.de>2008-10-20 07:38:11 -0400
commit643bdf68f92a8516574ed7ca3713f9334c331b8d (patch)
tree3f903134457f3fd633d13c632fa6b8222667cf20
parente1dd7bc58578ebfcaba989608017fe5156c29c86 (diff)
hrtimers: simplify hrtimer_peek_ahead_timers()
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--kernel/hrtimer.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index 00e6f0a1e7a3..4fc41414fc06 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1394,22 +1394,16 @@ void hrtimer_interrupt(struct clock_event_device *dev)
1394 */ 1394 */
1395void hrtimer_peek_ahead_timers(void) 1395void hrtimer_peek_ahead_timers(void)
1396{ 1396{
1397 unsigned long flags;
1398 struct tick_device *td; 1397 struct tick_device *td;
1399 struct clock_event_device *dev; 1398 unsigned long flags;
1400 1399
1401 if (!hrtimer_hres_active()) 1400 if (!hrtimer_hres_active())
1402 return; 1401 return;
1403 1402
1404 local_irq_save(flags); 1403 local_irq_save(flags);
1405 td = &__get_cpu_var(tick_cpu_device); 1404 td = &__get_cpu_var(tick_cpu_device);
1406 if (!td) 1405 if (td && td->evtdev)
1407 goto out; 1406 hrtimer_interrupt(td->evtdev);
1408 dev = td->evtdev;
1409 if (!dev)
1410 goto out;
1411 hrtimer_interrupt(dev);
1412out:
1413 local_irq_restore(flags); 1407 local_irq_restore(flags);
1414} 1408}
1415 1409