---

yaml --- r: 117630 b: refs/heads/master c: 643bdf6 h: refs/heads/master v: v3
git-mirror · Oct 20, 2008 · f8890e9 · f8890e9
1 parent fa5fbe1
commit f8890e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1dd7bc58578ebfcaba989608017fe5156c29c86
+refs/heads/master: 643bdf68f92a8516574ed7ca3713f9334c331b8d
diff --git a/trunk/kernel/hrtimer.c b/trunk/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);
 }