diff options
| author | Andrey Panin <pazke@donpac.ru> | 2005-07-27 11:43:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-27 16:25:54 -0700 |
| commit | 4bfdf37830111321e2cd1fe0102dd776ce93194d (patch) | |
| tree | 9791422b964d2aeae7772ac0462f1953e2f63447 /drivers/char/watchdog/softdog.c | |
| parent | 7657e20e46e26b198b24e2aefc696410bbe889c9 (diff) | |
| download | kernel_samsung_smdk4412-4bfdf37830111321e2cd1fe0102dd776ce93194d.zip kernel_samsung_smdk4412-4bfdf37830111321e2cd1fe0102dd776ce93194d.tar.gz kernel_samsung_smdk4412-4bfdf37830111321e2cd1fe0102dd776ce93194d.tar.bz2 | |
[PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handling
Attached patch removes #ifdef CONFIG_WATCHDOG_NOWAYOUT mess duplicated in
almost every watchdog driver and replaces it with common define in
linux/watchdog.h.
Signed-off-by: Andrey Panin <pazke@donpac.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/watchdog/softdog.c')
| -rw-r--r-- | drivers/char/watchdog/softdog.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/char/watchdog/softdog.c b/drivers/char/watchdog/softdog.c index 98c7578..4d7ed93 100644 --- a/drivers/char/watchdog/softdog.c +++ b/drivers/char/watchdog/softdog.c @@ -56,12 +56,7 @@ static int soft_margin = TIMER_MARGIN; /* in seconds */ module_param(soft_margin, int, 0); MODULE_PARM_DESC(soft_margin, "Watchdog soft_margin in seconds. (0<soft_margin<65536, default=" __MODULE_STRING(TIMER_MARGIN) ")"); -#ifdef CONFIG_WATCHDOG_NOWAYOUT -static int nowayout = 1; -#else -static int nowayout = 0; -#endif - +static int nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, int, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); |