summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-03-25 09:01:51 +0100
committerThomas Gleixner <tglx@linutronix.de>2008-03-25 20:13:25 +0100
commit898a19de1502649877091b398229026b4142c0e2 (patch)
tree14bb8190db30d356cb1da9e7467898e12bf26a29 /kernel
parenta4083c9271e0a697278e089f2c0b9a95363ada0a (diff)
downloadop-kernel-dev-898a19de1502649877091b398229026b4142c0e2.zip
op-kernel-dev-898a19de1502649877091b398229026b4142c0e2.tar.gz
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
Diffstat (limited to 'kernel')
-rw-r--r--kernel/time/clocksource.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index 278534b..7f60097 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 */
OpenPOWER on IntegriCloud