---

yaml --- r: 79693 b: refs/heads/master c: 1077f5a h: refs/heads/master i: 79691: 460a2f8 v: v3
git-mirror · Jan 30, 2008 · 47e9224 · 47e9224
1 parent aaf8ad2
commit 47e9224
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 */