2007-08-02 21:06:22

by Jeff Dike

[permalink] [raw]
Subject: [PATCH 3/6] UML - Fix nonremovability of watchdog

The UML watchdog driver was using the wrong config variable to control
whether it can be unloaded once active.

Signed-off-by: Jeff Dike <[email protected]>
--
arch/um/drivers/harddog_kern.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6.21-mm/arch/um/drivers/harddog_kern.c
===================================================================
--- linux-2.6.21-mm.orig/arch/um/drivers/harddog_kern.c 2007-08-02 16:43:17.000000000 -0400
+++ linux-2.6.21-mm/arch/um/drivers/harddog_kern.c 2007-08-02 16:43:24.000000000 -0400
@@ -69,7 +69,7 @@ static int harddog_open(struct inode *in
spin_lock(&lock);
if(timer_alive)
goto err;
-#ifdef CONFIG_HARDDOG_NOWAYOUT
+#ifdef CONFIG_WATCHDOG_NOWAYOUT
__module_get(THIS_MODULE);
#endif