From d28179329efb4c7b16f290a2796acf308a3908ac Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <peterz@infradead.org>
Date: Sun, 18 Jan 2009 16:39:29 +0100
Subject: [PATCH] --- yaml --- r: 129981 b: refs/heads/master c:
 1d4a7f1c4faf53eb9e822743ec8a70b3019a26d2 h: refs/heads/master i:   129979:
 37a68aec711b5fdf1d14261197e9670b8310abc2 v: v3

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

diff --git a/[refs] b/[refs]
index 14b92d9cbf1a..0d3bd218eb87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 934d96eafadcf3eb3ccd094af9919f020907fc41
+refs/heads/master: 1d4a7f1c4faf53eb9e822743ec8a70b3019a26d2
diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c
index 1455b7651b6b..cb83c6d4c07c 100644
--- a/trunk/kernel/hrtimer.c
+++ b/trunk/kernel/hrtimer.c
@@ -614,7 +614,9 @@ void clock_was_set(void)
  */
 void hres_timers_resume(void)
 {
-	/* Retrigger the CPU local events: */
+	WARN_ONCE(!irqs_disabled(),
+		  KERN_INFO "hres_timers_resume() called with IRQs enabled!");
+
 	retrigger_next_event(NULL);
 }