summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-10-20 13:38:11 +0200
committerThomas Gleixner <tglx@linutronix.de>2008-10-20 13:38:11 +0200
commit643bdf68f92a8516574ed7ca3713f9334c331b8d (patch)
tree3f903134457f3fd633d13c632fa6b8222667cf20
parenthrtimers: fix docbook comments (diff)
downloadlinux-643bdf68f92a8516574ed7ca3713f9334c331b8d.tar.xz
linux-643bdf68f92a8516574ed7ca3713f9334c331b8d.zip
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)
*/
void hrtimer_peek_ahead_timers(void)
{
- unsigned long flags;
struct tick_device *td;
- struct clock_event_device *dev;
+ unsigned long flags;
if (!hrtimer_hres_active())
return;
local_irq_save(flags);
td = &__get_cpu_var(tick_cpu_device);
- if (!td)
- goto out;
- dev = td->evtdev;
- if (!dev)
- goto out;
- hrtimer_interrupt(dev);
-out:
+ if (td && td->evtdev)
+ hrtimer_interrupt(td->evtdev);
local_irq_restore(flags);
}