[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20100223164019.60a6de1a@marrow.netinsight.se>
Date: Tue, 23 Feb 2010 16:40:19 +0100
From: Simon Kagstrom <simon.kagstrom@...insight.net>
To: linux-kernel@...r.kernel.org
Cc: wim@...ana.be, seth.heasley@...el.com
Subject: [PATCH] iTCO_wdt: Don't stop on shutdown with nowayout
Currently, the watchdog is turned off when the system shuts down or the
module is unloaded. If nowayout has been selected, this makes no sense
and fails to restart the system if it hangs during reboot, so make it
conditional.
Signed-off-by: Simon Kagstrom <simon.kagstrom@...insight.net>
---
We have a system which has such a hang, and therefore want the watchdog
to be on until the bitter end.
drivers/watchdog/iTCO_wdt.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index 4bdb7f1..927df26 100644
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -839,7 +839,8 @@ static int __devexit iTCO_wdt_remove(struct platform_device *dev)
static void iTCO_wdt_shutdown(struct platform_device *dev)
{
- iTCO_wdt_stop();
+ if (!nowayout)
+ iTCO_wdt_stop();
}
#define iTCO_wdt_suspend NULL
--
1.6.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists