From 3536638cdc5022ff98d62d5fd3c2d8b60d7fdda6 Mon Sep 17 00:00:00 2001
From: Stephen Boyd <sboyd@codeaurora.org>
Date: Mon, 7 Nov 2011 19:48:26 -0800
Subject: [PATCH] --- yaml --- r: 277118 b: refs/heads/master c:
 fb16b8cf0b66386134b09e7b8b7056450272d159 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4212db317cc8..bc6b52a75e21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b84d435cc228e87951f3bbabf6cc4a5f25d5fb16
+refs/heads/master: fb16b8cf0b66386134b09e7b8b7056450272d159
diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c
index dbaa62422b13..317087d5d5fc 100644
--- a/trunk/kernel/timer.c
+++ b/trunk/kernel/timer.c
@@ -427,6 +427,12 @@ static int timer_fixup_init(void *addr, enum debug_obj_state state)
 	}
 }
 
+/* Stub timer callback for improperly used timers. */
+static void stub_timer(unsigned long data)
+{
+	WARN_ON(1);
+}
+
 /*
  * fixup_activate is called when:
  * - an active object is activated
@@ -450,7 +456,8 @@ static int timer_fixup_activate(void *addr, enum debug_obj_state state)
 			debug_object_activate(timer, &timer_debug_descr);
 			return 0;
 		} else {
-			WARN_ON_ONCE(1);
+			setup_timer(timer, stub_timer, 0);
+			return 1;
 		}
 		return 0;