[WATCHDOG] v2.6.7 indydog.c-patch-20040627

[Wim Van Sebroeck]

Hi Linus, Andrew,

please do a

	bk pull http://linux-watchdog.bkbits.net/linux-2.6-watchdog

This will update the following files:

 drivers/char/watchdog/indydog.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

through these ChangeSets:

<wim@xxxxxxxxx> (04/06/27 1.1770)
   [WATCHDOG] indydog.c-patch-20040627
   
   * Fix: since we use the new module_param's: make sure that
   linux/moduleparam.h stays included
   * in the release code we can just use indydog_stop();


The ChangeSets can also be looked at on:
	http://linux-watchdog.bkbits.net:8080/linux-2.6-watchdog

For completeness, I added the patches below.

Greetings,
Wim.

================================================================================
diff -Nru a/drivers/char/watchdog/indydog.c b/drivers/char/watchdog/indydog.c
--- a/drivers/char/watchdog/indydog.c	Sun Jun 27 12:23:11 2004
+++ b/drivers/char/watchdog/indydog.c	Sun Jun 27 12:23:11 2004
@@ -12,6 +12,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -87,12 +88,9 @@
 {
 	/* Shut off the timer.
 	 * Lock it in if it's a module and we defined ...NOWAYOUT */
-	if (!nowayout) {
-		u32 mc_ctrl0 = sgimc->cpuctrl0;
-		mc_ctrl0 &= ~SGIMC_CCTRL0_WDOG;
-		sgimc->cpuctrl0 = mc_ctrl0;
-		printk(KERN_INFO "Stopped watchdog timer.\n");
-	}
+	if (!nowayout)
+		indydog_stop();		/* Turn the WDT off */
+
 	indydog_alive = 0;
 
 	return 0;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/