From 325e4105cff421e1cc955935a07ece6e424149ac Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 12 Mar 2010 20:13:23 +0100
Subject: [PATCH] --- yaml --- r: 192242 b: refs/heads/master c:
 802702e0c2618465b813242d4dfee6a233ba0beb h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ca67ae016433..d6901bfcd119 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 576da126a6c7364d70dfd58d0bbe43d05cf5859f
+refs/heads/master: 802702e0c2618465b813242d4dfee6a233ba0beb
diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c
index 45229694dc6a..7e12e7bc7ce6 100644
--- a/trunk/kernel/timer.c
+++ b/trunk/kernel/timer.c
@@ -982,9 +982,15 @@ static void call_timer_fn(struct timer_list *timer, void (*fn)(unsigned long),
 	lock_map_release(&lockdep_map);
 
 	if (preempt_count != preempt_count()) {
-		printk(KERN_ERR "timer: %pF preempt leak: %08x -> %08x\n",
-		       fn, preempt_count, preempt_count());
-		BUG();
+		WARN_ONCE(1, "timer: %pF preempt leak: %08x -> %08x\n",
+			  fn, preempt_count, preempt_count());
+		/*
+		 * Restore the preempt count. That gives us a decent
+		 * chance to survive and extract information. If the
+		 * callback kept a lock held, bad luck, but not worse
+		 * than the BUG() we had.
+		 */
+		preempt_count() = preempt_count;
 	}
 }