Skip to content

R
raspberrypi-kernel

openeuler / raspberrypi-kernel

通知 13
Star 1
Fork 0
R
raspberrypi-kernel
提交 4bfdf378 编写于 作者: A Andrey Panin 提交者： Linus Torvalds
浏览文件
操作

[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: NAndrey Panin <pazke@donpac.ru>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 7657e20e
隐藏空白更改
内联 并排
Showing with 41 addition and 179 deletion
drivers/char/ipmi/ipmi_watchdog.c
浏览文件 @ 4bfdf378
...@@ -131,11 +131,7 @@ ...@@ -131,11 +131,7 @@
#define WDIOC_GET_PRETIMEOUT _IOW(WATCHDOG_IOCTL_BASE, 22, int) #define WDIOC_GET_PRETIMEOUT _IOW(WATCHDOG_IOCTL_BASE, 22, int)
#endif #endif
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout;
#endif
static ipmi_user_t watchdog_user = NULL; static ipmi_user_t watchdog_user = NULL;
......
drivers/char/watchdog/acquirewdt.c
浏览文件 @ 4bfdf378
...@@ -82,12 +82,7 @@ static int wdt_start = 0x443; ...@@ -82,12 +82,7 @@ static int wdt_start = 0x443;
module_param(wdt_start, int, 0); module_param(wdt_start, int, 0);
MODULE_PARM_DESC(wdt_start, "Acquire WDT 'start' io port (default 0x443)"); MODULE_PARM_DESC(wdt_start, "Acquire WDT 'start' io port (default 0x443)");
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
......
drivers/char/watchdog/advantechwdt.c
浏览文件 @ 4bfdf378
...@@ -73,12 +73,7 @@ static int timeout = WATCHDOG_TIMEOUT; /* in seconds */ ...@@ -73,12 +73,7 @@ static int timeout = WATCHDOG_TIMEOUT; /* in seconds */
module_param(timeout, int, 0); module_param(timeout, int, 0);
MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<= timeout <=63, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) "."); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<= timeout <=63, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ".");
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
......
drivers/char/watchdog/alim1535_wdt.c
浏览文件 @ 4bfdf378
...@@ -38,12 +38,7 @@ static int timeout = WATCHDOG_TIMEOUT; ...@@ -38,12 +38,7 @@ static int timeout = WATCHDOG_TIMEOUT;
module_param(timeout, int, 0); module_param(timeout, int, 0);
MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (0<timeout<18000, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (0<timeout<18000, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
......
drivers/char/watchdog/alim7101_wdt.c
浏览文件 @ 4bfdf378
...@@ -75,12 +75,7 @@ static unsigned long wdt_is_open; ...@@ -75,12 +75,7 @@ static unsigned long wdt_is_open;
static char wdt_expect_close; static char wdt_expect_close;
static struct pci_dev *alim7101_pmu; static struct pci_dev *alim7101_pmu;
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
......
drivers/char/watchdog/eurotechwdt.c
浏览文件 @ 4bfdf378
...@@ -72,12 +72,7 @@ static char *ev = "int"; ...@@ -72,12 +72,7 @@ static char *ev = "int";
#define WDT_TIMEOUT 60 /* 1 minute */ #define WDT_TIMEOUT 60 /* 1 minute */
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
......
drivers/char/watchdog/i8xx_tco.c
浏览文件 @ 4bfdf378
...@@ -105,12 +105,7 @@ static int heartbeat = WATCHDOG_HEARTBEAT; /* in seconds */ ...@@ -105,12 +105,7 @@ static int heartbeat = WATCHDOG_HEARTBEAT; /* in seconds */
module_param(heartbeat, int, 0); module_param(heartbeat, int, 0);
MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (2<heartbeat<39, default=" __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (2<heartbeat<39, default=" __MODULE_STRING(WATCHDOG_HEARTBEAT) ")");
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
......
drivers/char/watchdog/ib700wdt.c
浏览文件 @ 4bfdf378
...@@ -117,12 +117,7 @@ static int wd_times[] = { ...@@ -117,12 +117,7 @@ static int wd_times[] = {
static int wd_margin = WD_TIMO; static int wd_margin = WD_TIMO;
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
......
drivers/char/watchdog/indydog.c
浏览文件 @ 4bfdf378
...@@ -29,14 +29,9 @@ ...@@ -29,14 +29,9 @@
#define PFX "indydog: " #define PFX "indydog: "
static int indydog_alive; static int indydog_alive;
#ifdef CONFIG_WATCHDOG_NOWAYOUT
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
#define WATCHDOG_TIMEOUT 30 /* 30 sec default timeout */ #define WATCHDOG_TIMEOUT 30 /* 30 sec default timeout */
static int nowayout = WATCHDOG_NOWAYOUT;
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
......
drivers/char/watchdog/ixp2000_wdt.c
浏览文件 @ 4bfdf378
...@@ -30,11 +30,7 @@ ...@@ -30,11 +30,7 @@
#include <asm/hardware.h> #include <asm/hardware.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
static unsigned int heartbeat = 60; /* (secs) Default is 1 minute */ static unsigned int heartbeat = 60; /* (secs) Default is 1 minute */
static unsigned long wdt_status; static unsigned long wdt_status;
......
drivers/char/watchdog/ixp4xx_wdt.c
浏览文件 @ 4bfdf378
...@@ -27,11 +27,7 @@ ...@@ -27,11 +27,7 @@
#include <asm/hardware.h> #include <asm/hardware.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
static int heartbeat = 60; /* (secs) Default is 1 minute */ static int heartbeat = 60; /* (secs) Default is 1 minute */
static unsigned long wdt_status; static unsigned long wdt_status;
static unsigned long boot_status; static unsigned long boot_status;
......
drivers/char/watchdog/machzwd.c
浏览文件 @ 4bfdf378
...@@ -94,12 +94,7 @@ MODULE_DESCRIPTION("MachZ ZF-Logic Watchdog driver"); ...@@ -94,12 +94,7 @@ MODULE_DESCRIPTION("MachZ ZF-Logic Watchdog driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
......
drivers/char/watchdog/mixcomwd.c
浏览文件 @ 4bfdf378
...@@ -62,12 +62,7 @@ static int mixcomwd_timer_alive; ...@@ -62,12 +62,7 @@ static int mixcomwd_timer_alive;
static struct timer_list mixcomwd_timer = TIMER_INITIALIZER(NULL, 0, 0); static struct timer_list mixcomwd_timer = TIMER_INITIALIZER(NULL, 0, 0);
static char expect_close; static char expect_close;
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
......
drivers/char/watchdog/pcwd.c
浏览文件 @ 4bfdf378
...@@ -146,12 +146,7 @@ static int heartbeat = WATCHDOG_HEARTBEAT; ...@@ -146,12 +146,7 @@ static int heartbeat = WATCHDOG_HEARTBEAT;
module_param(heartbeat, int, 0); module_param(heartbeat, int, 0);
MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (2<=heartbeat<=7200, default=" __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (2<=heartbeat<=7200, default=" __MODULE_STRING(WATCHDOG_HEARTBEAT) ")");
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
......
drivers/char/watchdog/pcwd_pci.c
浏览文件 @ 4bfdf378
...@@ -103,12 +103,7 @@ static int heartbeat = WATCHDOG_HEARTBEAT; ...@@ -103,12 +103,7 @@ static int heartbeat = WATCHDOG_HEARTBEAT;
module_param(heartbeat, int, 0); module_param(heartbeat, int, 0);
MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (0<heartbeat<65536, default=" __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (0<heartbeat<65536, default=" __MODULE_STRING(WATCHDOG_HEARTBEAT) ")");
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
......
drivers/char/watchdog/pcwd_usb.c
浏览文件 @ 4bfdf378
...@@ -79,12 +79,7 @@ static int heartbeat = WATCHDOG_HEARTBEAT; ...@@ -79,12 +79,7 @@ static int heartbeat = WATCHDOG_HEARTBEAT;
module_param(heartbeat, int, 0); module_param(heartbeat, int, 0);
MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (0<heartbeat<65536, default=" __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (0<heartbeat<65536, default=" __MODULE_STRING(WATCHDOG_HEARTBEAT) ")");
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
......
drivers/char/watchdog/s3c2410_wdt.c
浏览文件 @ 4bfdf378
...@@ -62,12 +62,7 @@ ...@@ -62,12 +62,7 @@
#define CONFIG_S3C2410_WATCHDOG_ATBOOT (0) #define CONFIG_S3C2410_WATCHDOG_ATBOOT (0)
#define CONFIG_S3C2410_WATCHDOG_DEFAULT_TIME (15) #define CONFIG_S3C2410_WATCHDOG_DEFAULT_TIME (15)
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
static int tmr_margin = CONFIG_S3C2410_WATCHDOG_DEFAULT_TIME; static int tmr_margin = CONFIG_S3C2410_WATCHDOG_DEFAULT_TIME;
static int tmr_atboot = CONFIG_S3C2410_WATCHDOG_ATBOOT; static int tmr_atboot = CONFIG_S3C2410_WATCHDOG_ATBOOT;
static int soft_noboot = 0; static int soft_noboot = 0;
......
drivers/char/watchdog/sa1100_wdt.c
浏览文件 @ 4bfdf378
...@@ -42,11 +42,7 @@ static unsigned long sa1100wdt_users; ...@@ -42,11 +42,7 @@ static unsigned long sa1100wdt_users;
static int expect_close; static int expect_close;
static int pre_margin; static int pre_margin;
static int boot_status; static int boot_status;
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
/* /*
* Allow only one person to hold it open * Allow only one person to hold it open
......
drivers/char/watchdog/sbc60xxwdt.c
浏览文件 @ 4bfdf378
...@@ -98,12 +98,7 @@ static int timeout = WATCHDOG_TIMEOUT; /* in seconds, will be multiplied by HZ t ...@@ -98,12 +98,7 @@ static int timeout = WATCHDOG_TIMEOUT; /* in seconds, will be multiplied by HZ t
module_param(timeout, int, 0); module_param(timeout, int, 0);
MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (1<=timeout<=3600, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (1<=timeout<=3600, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
......
drivers/char/watchdog/sc1200wdt.c
浏览文件 @ 4bfdf378
...@@ -91,12 +91,7 @@ MODULE_PARM_DESC(io, "io port"); ...@@ -91,12 +91,7 @@ MODULE_PARM_DESC(io, "io port");
module_param(timeout, int, 0); module_param(timeout, int, 0);
MODULE_PARM_DESC(timeout, "range is 0-255 minutes, default is 1"); MODULE_PARM_DESC(timeout, "range is 0-255 minutes, default is 1");
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
......
drivers/char/watchdog/sc520_wdt.c
浏览文件 @ 4bfdf378
...@@ -94,12 +94,7 @@ static int timeout = WATCHDOG_TIMEOUT; /* in seconds, will be multiplied by HZ t ...@@ -94,12 +94,7 @@ static int timeout = WATCHDOG_TIMEOUT; /* in seconds, will be multiplied by HZ t
module_param(timeout, int, 0); module_param(timeout, int, 0);
MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (1<=timeout<=3600, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (1<=timeout<=3600, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
......
drivers/char/watchdog/scx200_wdt.c
浏览文件 @ 4bfdf378
...@@ -39,15 +39,11 @@ MODULE_DESCRIPTION("NatSemi SCx200 Watchdog Driver"); ...@@ -39,15 +39,11 @@ MODULE_DESCRIPTION("NatSemi SCx200 Watchdog Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
#ifndef CONFIG_WATCHDOG_NOWAYOUT
#define CONFIG_WATCHDOG_NOWAYOUT 0
#endif
static int margin = 60; /* in seconds */ static int margin = 60; /* in seconds */
module_param(margin, int, 0); module_param(margin, int, 0);
MODULE_PARM_DESC(margin, "Watchdog margin in seconds"); MODULE_PARM_DESC(margin, "Watchdog margin in seconds");
static int nowayout = CONFIG_WATCHDOG_NOWAYOUT; static int nowayout = WATCHDOG_NOWAYOUT;
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Disable watchdog shutdown on close"); MODULE_PARM_DESC(nowayout, "Disable watchdog shutdown on close");
......
drivers/char/watchdog/shwdt.c
浏览文件 @ 4bfdf378
...@@ -75,11 +75,7 @@ static unsigned long next_heartbeat; ...@@ -75,11 +75,7 @@ static unsigned long next_heartbeat;
#define WATCHDOG_HEARTBEAT 30 /* 30 sec default heartbeat */ #define WATCHDOG_HEARTBEAT 30 /* 30 sec default heartbeat */
static int heartbeat = WATCHDOG_HEARTBEAT; /* in seconds */ static int heartbeat = WATCHDOG_HEARTBEAT; /* in seconds */
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
/** /**
* sh_wdt_start - Start the Watchdog * sh_wdt_start - Start the Watchdog
......
drivers/char/watchdog/softdog.c
浏览文件 @ 4bfdf378
...@@ -56,12 +56,7 @@ static int soft_margin = TIMER_MARGIN; /* in seconds */ ...@@ -56,12 +56,7 @@ static int soft_margin = TIMER_MARGIN; /* in seconds */
module_param(soft_margin, int, 0); 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) ")"); 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 = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
......
drivers/char/watchdog/w83627hf_wdt.c
浏览文件 @ 4bfdf378
...@@ -54,12 +54,7 @@ static int timeout = WATCHDOG_TIMEOUT; /* in seconds */ ...@@ -54,12 +54,7 @@ static int timeout = WATCHDOG_TIMEOUT; /* in seconds */
module_param(timeout, int, 0); module_param(timeout, int, 0);
MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<= timeout <=63, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) "."); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<= timeout <=63, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ".");
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
......
drivers/char/watchdog/w83877f_wdt.c
浏览文件 @ 4bfdf378
...@@ -85,12 +85,7 @@ module_param(timeout, int, 0); ...@@ -85,12 +85,7 @@ module_param(timeout, int, 0);
MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (1<=timeout<=3600, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (1<=timeout<=3600, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
......
drivers/char/watchdog/wafer5823wdt.c
浏览文件 @ 4bfdf378
...@@ -63,12 +63,7 @@ static int timeout = WD_TIMO; /* in seconds */ ...@@ -63,12 +63,7 @@ static int timeout = WD_TIMO; /* in seconds */
module_param(timeout, int, 0); module_param(timeout, int, 0);
MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<= timeout <=255, default=" __MODULE_STRING(WD_TIMO) "."); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<= timeout <=255, default=" __MODULE_STRING(WD_TIMO) ".");
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
......
drivers/char/watchdog/wdt.c
浏览文件 @ 4bfdf378
...@@ -63,12 +63,7 @@ static int wd_heartbeat; ...@@ -63,12 +63,7 @@ static int wd_heartbeat;
module_param(heartbeat, int, 0); module_param(heartbeat, int, 0);
MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (0<heartbeat<65536, default=" __MODULE_STRING(WD_TIMO) ")"); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (0<heartbeat<65536, default=" __MODULE_STRING(WD_TIMO) ")");
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
......
drivers/char/watchdog/wdt977.c
浏览文件 @ 4bfdf378
...@@ -53,12 +53,7 @@ MODULE_PARM_DESC(timeout,"Watchdog timeout in seconds (60..15300), default=" __M ...@@ -53,12 +53,7 @@ MODULE_PARM_DESC(timeout,"Watchdog timeout in seconds (60..15300), default=" __M
module_param(testmode, int, 0); module_param(testmode, int, 0);
MODULE_PARM_DESC(testmode,"Watchdog testmode (1 = no reboot), default=0"); MODULE_PARM_DESC(testmode,"Watchdog testmode (1 = no reboot), default=0");
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
......
drivers/char/watchdog/wdt_pci.c
浏览文件 @ 4bfdf378
...@@ -89,12 +89,7 @@ static int wd_heartbeat; ...@@ -89,12 +89,7 @@ static int wd_heartbeat;
module_param(heartbeat, int, 0); module_param(heartbeat, int, 0);
MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (0<heartbeat<65536, default=" __MODULE_STRING(WD_TIMO) ")"); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (0<heartbeat<65536, default=" __MODULE_STRING(WD_TIMO) ")");
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = WATCHDOG_NOWAYOUT;
static int nowayout = 1;
#else
static int nowayout = 0;
#endif
module_param(nowayout, int, 0); module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
......
drivers/s390/char/vmwatchdog.c
浏览文件 @ 4bfdf378
...@@ -23,11 +23,7 @@ ...@@ -23,11 +23,7 @@
static char vmwdt_cmd[MAX_CMDLEN] = "IPL"; static char vmwdt_cmd[MAX_CMDLEN] = "IPL";
static int vmwdt_conceal; static int vmwdt_conceal;
#ifdef CONFIG_WATCHDOG_NOWAYOUT static int vmwdt_nowayout = WATCHDOG_NOWAYOUT;
static int vmwdt_nowayout = 1;
#else
static int vmwdt_nowayout = 0;
#endif
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Arnd Bergmann <arndb@de.ibm.com>"); MODULE_AUTHOR("Arnd Bergmann <arndb@de.ibm.com>");
......
include/linux/watchdog.h
浏览文件 @ 4bfdf378
...@@ -47,4 +47,14 @@ struct watchdog_info { ...@@ -47,4 +47,14 @@ struct watchdog_info {
#define WDIOS_ENABLECARD 0x0002 /* Turn on the watchdog timer */ #define WDIOS_ENABLECARD 0x0002 /* Turn on the watchdog timer */
#define WDIOS_TEMPPANIC 0x0004 /* Kernel panic on temperature trip */ #define WDIOS_TEMPPANIC 0x0004 /* Kernel panic on temperature trip */
#ifdef __KERNEL__
#ifdef CONFIG_WATCHDOG_NOWAYOUT
#define WATCHDOG_NOWAYOUT 1
#else
#define WATCHDOG_NOWAYOUT 0
#endif
#endif /* __KERNEL__ */
#endif /* ifndef _LINUX_WATCHDOG_H */ #endif /* ifndef _LINUX_WATCHDOG_H */
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或