diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2012-11-24 20:24:27 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2012-11-24 20:24:27 +0000 |
| commit | dfc7942c3e89e94d3f22b9d80827d39a22719c40 (patch) | |
| tree | 5d403f3c598a1e6e1804257c5016a9b64e84bedd /target/linux/brcm47xx/patches-3.6/544-watchdog-bcm47xx_wdt.c-add-hard-timer.patch | |
| parent | afc3c7596af4c3e52d3783732babdfb7b60009b7 (diff) | |
| download | upstream-dfc7942c3e89e94d3f22b9d80827d39a22719c40.tar.gz upstream-dfc7942c3e89e94d3f22b9d80827d39a22719c40.tar.bz2 upstream-dfc7942c3e89e94d3f22b9d80827d39a22719c40.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.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34324 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6/544-watchdog-bcm47xx_wdt.c-add-hard-timer.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.6/544-watchdog-bcm47xx_wdt.c-add-hard-timer.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/544-watchdog-bcm47xx_wdt.c-add-hard-timer.patch b/target/linux/brcm47xx/patches-3.6/544-watchdog-bcm47xx_wdt.c-add-hard-timer.patch index 3e67ba2bb1..6970e10ea0 100644 --- a/target/linux/brcm47xx/patches-3.6/544-watchdog-bcm47xx_wdt.c-add-hard-timer.patch +++ b/target/linux/brcm47xx/patches-3.6/544-watchdog-bcm47xx_wdt.c-add-hard-timer.patch @@ -8,7 +8,7 @@ static int timeout = WDT_DEFAULT_TIME; static bool nowayout = WATCHDOG_NOWAYOUT; -@@ -52,6 +53,53 @@ static inline struct bcm47xx_wdt *bcm47x +@@ -50,6 +51,53 @@ static inline struct bcm47xx_wdt *bcm47x return container_of(wdd, struct bcm47xx_wdt, wdd); } @@ -62,7 +62,7 @@ static void bcm47xx_wdt_soft_timer_tick(unsigned long data) { struct bcm47xx_wdt *wdt = (struct bcm47xx_wdt *)data; -@@ -136,15 +184,22 @@ static struct watchdog_ops bcm47xx_wdt_s +@@ -134,15 +182,22 @@ static struct watchdog_ops bcm47xx_wdt_s static int __devinit bcm47xx_wdt_probe(struct platform_device *pdev) { int ret; @@ -88,7 +88,7 @@ wdt->wdd.info = &bcm47xx_wdt_info; wdt->wdd.timeout = WDT_DEFAULT_TIME; ret = wdt->wdd.ops->set_timeout(&wdt->wdd, timeout); -@@ -162,14 +217,16 @@ static int __devinit bcm47xx_wdt_probe(s +@@ -160,14 +215,16 @@ static int __devinit bcm47xx_wdt_probe(s if (ret) goto err_notifier; |