[PATCH] softdog.c (was: Kernel panic after rmmod softdog (2.6.8.1))

[Chuck Ebbert]

Michael Schierl wrote:

> today, when testing the software watchdog, I accidentally removed the 
> software watchdog kernel module and got a kernel panic.

Does this fix it? (compiled but not tested)

--- linux-2.6.8.1/drivers/char/watchdog/softdog.c.orig  Sun Oct 10 23:08:24 2004
+++ linux-2.6.8.1/drivers/char/watchdog/softdog.c       Sun Oct 10 23:10:12 2004
@@ -135,8 +135,9 @@
 {
        if(test_and_set_bit(0, &timer_alive))
                return -EBUSY;
-       if (nowayout)
-               __module_get(THIS_MODULE);
+
+       __module_get(THIS_MODULE);
+
        /*
         *      Activate timer
         */
@@ -152,6 +153,7 @@
         */
        if (expect_close == 42) {
                softdog_stop();
+               module_put(THIS_MODULE);
        } else {
                printk(KERN_CRIT PFX "Unexpected close, not stopping watchdog!\n");
                softdog_keepalive();


--Chuck Ebbert  11-Oct-04  12:49:45
  Current book: Stephen King: Wizard and Glass
-
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/