From: Jeff Dike <jdike@addtoit.com>
Date: Tue, 16 Oct 2007 08:26:45 +0000 (-0700)
Subject: uml: fix nonremovability of watchdog
X-Git-Tag: upstream/snapshot3+hdmi~30380
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d82076080d909f18dea859a6767df7e3ff69241;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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 <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/arch/um/drivers/harddog_kern.c b/arch/um/drivers/harddog_kern.c
index 5560168..a9ad4bd 100644
--- a/arch/um/drivers/harddog_kern.c
+++ b/arch/um/drivers/harddog_kern.c
@@ -69,7 +69,7 @@ static int harddog_open(struct inode *inode, struct file *file)
 	spin_lock(&lock);
 	if(timer_alive)
 		goto err;
-#ifdef CONFIG_HARDDOG_NOWAYOUT
+#ifdef CONFIG_WATCHDOG_NOWAYOUT
 	__module_get(THIS_MODULE);
 #endif