diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-11-24 20:24:27 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2012-11-24 20:24:27 +0000 |
commit | 264873b3c551b2577a953d34b04107bda47fddce (patch) | |
tree | 12494fdcd20bc57bd5cba0764bbdadf11af772a9 /target/linux/brcm47xx/patches-3.6/543-watchdog-bcm47xx_wdt.c-rename-wdt_timeout-to-timeout.patch | |
parent | c62d86ecb87f695d9065a29e6ec4cd49ea5f21ad (diff) | |
download | master-31e0f0ae-264873b3c551b2577a953d34b04107bda47fddce.tar.gz master-31e0f0ae-264873b3c551b2577a953d34b04107bda47fddce.tar.bz2 master-31e0f0ae-264873b3c551b2577a953d34b04107bda47fddce.zip |
brcm47xx: watchdog: deactivate NOWAYOUT.
In the old configuration the SoC issued a reboot if the watchdog was
killed also if it was kill with TERM and not KILL.
This will fix #11724.
SVN-Revision: 34324
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6/543-watchdog-bcm47xx_wdt.c-rename-wdt_timeout-to-timeout.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.6/543-watchdog-bcm47xx_wdt.c-rename-wdt_timeout-to-timeout.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/543-watchdog-bcm47xx_wdt.c-rename-wdt_timeout-to-timeout.patch b/target/linux/brcm47xx/patches-3.6/543-watchdog-bcm47xx_wdt.c-rename-wdt_timeout-to-timeout.patch index c08f0b1536..568581faeb 100644 --- a/target/linux/brcm47xx/patches-3.6/543-watchdog-bcm47xx_wdt.c-rename-wdt_timeout-to-timeout.patch +++ b/target/linux/brcm47xx/patches-3.6/543-watchdog-bcm47xx_wdt.c-rename-wdt_timeout-to-timeout.patch @@ -17,8 +17,8 @@ +MODULE_PARM_DESC(timeout, "Watchdog time in seconds. (default=" __MODULE_STRING(WDT_DEFAULT_TIME) ")"); - #ifdef CONFIG_WATCHDOG_NOWAYOUT -@@ -97,9 +97,9 @@ static int bcm47xx_wdt_soft_stop(struct + module_param(nowayout, bool, 0); +@@ -95,9 +95,9 @@ static int bcm47xx_wdt_soft_stop(struct static int bcm47xx_wdt_soft_set_timeout(struct watchdog_device *wdd, unsigned int new_time) { @@ -30,7 +30,7 @@ return -EINVAL; } -@@ -163,7 +163,7 @@ static int __devinit bcm47xx_wdt_probe(s +@@ -161,7 +161,7 @@ static int __devinit bcm47xx_wdt_probe(s goto err_notifier; pr_info("BCM47xx Watchdog Timer enabled (%d seconds%s)\n", |