From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 25 Mar 2008 08:01:51 +0000 (+0100)
Subject: clocksource: revert: use init_timer_deferrable for clocksource_watchdog
X-Git-Tag: MMI-PSA29.97-13-9~35855^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=898a19de1502649877091b398229026b4142c0e2;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

clocksource: revert: use init_timer_deferrable for clocksource_watchdog

Revert

commit 1077f5a917b7c630231037826b344b2f7f5b903f
Author: Parag Warudkar <parag.warudkar@gmail.com>
Date:   Wed Jan 30 13:30:01 2008 +0100

    clocksource.c: use init_timer_deferrable for clocksource_watchdog

    clocksource_watchdog can use a deferrable timer - reduces wakeups from
    idle per second.

The watchdog timer needs to run with the specified interval. Otherwise
it will miss the possible wrap of the watchdog clocksource.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@kernel.org
---

diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index 278534bbca95..7f60097d443a 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -174,7 +174,7 @@ static void clocksource_check_watchdog(struct clocksource *cs)
 			if (watchdog)
 				del_timer(&watchdog_timer);
 			watchdog = cs;
-			init_timer_deferrable(&watchdog_timer);
+			init_timer(&watchdog_timer);
 			watchdog_timer.function = clocksource_watchdog;
 
 			/* Reset watchdog cycles */