diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 01:26:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 09:43:04 -0700 |
| commit | 8d82076080d909f18dea859a6767df7e3ff69241 (patch) | |
| tree | 03da6954f34f73bc8fa3065fbb88507b9b41a034 /arch | |
| parent | 818f6ef407b448cef63294b9d0f6f8a2af9cb817 (diff) | |
| download | op-kernel-dev-8d82076080d909f18dea859a6767df7e3ff69241.zip op-kernel-dev-8d82076080d909f18dea859a6767df7e3ff69241.tar.gz | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/drivers/harddog_kern.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |
