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 */