aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/watchdog/softdog.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c
index 0a29f5a08337..42faa3d424d5 100644
--- a/drivers/watchdog/softdog.c
+++ b/drivers/watchdog/softdog.c
@@ -54,11 +54,6 @@ module_param(soft_panic, int, 0);
54MODULE_PARM_DESC(soft_panic, 54MODULE_PARM_DESC(soft_panic,
55 "Softdog action, set to 1 to panic, 0 to reboot (default=0)"); 55 "Softdog action, set to 1 to panic, 0 to reboot (default=0)");
56 56
57static void softdog_fire(unsigned long);
58
59static struct timer_list softdog_ticktock =
60 TIMER_INITIALIZER(softdog_fire, 0, 0);
61
62static void softdog_fire(unsigned long data) 57static void softdog_fire(unsigned long data)
63{ 58{
64 module_put(THIS_MODULE); 59 module_put(THIS_MODULE);
@@ -74,6 +69,9 @@ static void softdog_fire(unsigned long data)
74 } 69 }
75} 70}
76 71
72static struct timer_list softdog_ticktock =
73 TIMER_INITIALIZER(softdog_fire, 0, 0);
74
77static int softdog_ping(struct watchdog_device *w) 75static int softdog_ping(struct watchdog_device *w)
78{ 76{
79 if (!mod_timer(&softdog_ticktock, jiffies+(w->timeout*HZ))) 77 if (!mod_timer(&softdog_ticktock, jiffies+(w->timeout*HZ)))