From 47e9224cc71461b9de8d7af2e4059719bb410294 Mon Sep 17 00:00:00 2001
From: Parag Warudkar <parag.warudkar@gmail.com>
Date: Wed, 30 Jan 2008 13:30:01 +0100
Subject: [PATCH] --- yaml --- r: 79693 b: refs/heads/master c:
 1077f5a917b7c630231037826b344b2f7f5b903f h: refs/heads/master i:   79691:
 460a2f8519a52db11be27d9ac62933558394e0e0 v: v3

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

diff --git a/[refs] b/[refs]
index 1b7942438ce4..c58372d73dce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efd9ac8630e89b9ee7ce64008bd7783952374f37
+refs/heads/master: 1077f5a917b7c630231037826b344b2f7f5b903f
diff --git a/trunk/kernel/time/clocksource.c b/trunk/kernel/time/clocksource.c
index 8d6125ad2cf0..cabfa193efb3 100644
--- a/trunk/kernel/time/clocksource.c
+++ b/trunk/kernel/time/clocksource.c
@@ -175,7 +175,7 @@ static void clocksource_check_watchdog(struct clocksource *cs)
 			if (watchdog)
 				del_timer(&watchdog_timer);
 			watchdog = cs;
-			init_timer(&watchdog_timer);
+			init_timer_deferrable(&watchdog_timer);
 			watchdog_timer.function = clocksource_watchdog;
 
 			/* Reset watchdog cycles */