diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-11-24 20:24:27 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-11-24 20:24:27 +0000 |
| commit | c57e2a3047ba7651aae205b34fe701c3312ca5e9 (patch) | |
| tree | 5d403f3c598a1e6e1804257c5016a9b64e84bedd /target/linux/brcm47xx/patches-3.6/543-watchdog-bcm47xx_wdt.c-rename-wdt_timeout-to-timeout.patch | |
| parent | 9a462204d13bd8acd735f8111dc7f9412e812b33 (diff) | |
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.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34324 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 c08f0b153..568581fae 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", |