From ca19fdb0f7b8c5e6c99961ab25ed9753a15d00c6 Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@linux.intel.com>
Date: Sat, 11 Oct 2008 12:25:45 -0700
Subject: [PATCH] --- yaml --- r: 117624 b: refs/heads/master c:
 030aebd2e439a2ebcca2b0ce30a02ed84feb043e h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/kernel/hrtimer.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4ad8d5b494e0..c98ef14bb4fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2778d0d51dd5007c4909c1d9874f5e9097785a7a
+refs/heads/master: 030aebd2e439a2ebcca2b0ce30a02ed84feb043e
diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c
index 2bd230be1cb5..b17657d8d81a 100644
--- a/trunk/kernel/hrtimer.c
+++ b/trunk/kernel/hrtimer.c
@@ -1395,11 +1395,15 @@ void hrtimer_peek_ahead_timers(void)
 	unsigned long flags;
 	struct tick_device *td;
 	struct clock_event_device *dev;
-
-	if (!hrtimer_hres_active())
+	struct hrtimer_cpu_base *cpu_base;
+	if (hrtimer_hres_active())
 		return;
 
 	local_irq_save(flags);
+	cpu_base = &__get_cpu_var(hrtimer_bases);
+	if (!cpu_base->hres_active)
+		goto out;
+
 	td = &__get_cpu_var(tick_cpu_device);
 	if (!td)
 		goto out;