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/542-watchdog-bcm47xx_wdt.c-rename-ops-methods.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/542-watchdog-bcm47xx_wdt.c-rename-ops-methods.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.6/542-watchdog-bcm47xx_wdt.c-rename-ops-methods.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/542-watchdog-bcm47xx_wdt.c-rename-ops-methods.patch b/target/linux/brcm47xx/patches-3.6/542-watchdog-bcm47xx_wdt.c-rename-ops-methods.patch index 54956fd2d..8d85303e4 100644 --- a/target/linux/brcm47xx/patches-3.6/542-watchdog-bcm47xx_wdt.c-rename-ops-methods.patch +++ b/target/linux/brcm47xx/patches-3.6/542-watchdog-bcm47xx_wdt.c-rename-ops-methods.patch @@ -1,8 +1,8 @@ --- a/drivers/watchdog/bcm47xx_wdt.c +++ b/drivers/watchdog/bcm47xx_wdt.c -@@ -46,12 +46,13 @@ MODULE_PARM_DESC(nowayout, +@@ -44,12 +44,13 @@ MODULE_PARM_DESC(nowayout, + "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); - #endif + static inline struct bcm47xx_wdt *bcm47xx_wdt_get(struct watchdog_device *wdd) @@ -15,7 +15,7 @@ { struct bcm47xx_wdt *wdt = (struct bcm47xx_wdt *)data; u32 next_tick = min(wdt->wdd.timeout * 1000, wdt->max_timer_ms); -@@ -64,7 +65,7 @@ static void bcm47xx_timer_tick(unsigned +@@ -62,7 +63,7 @@ static void bcm47xx_timer_tick(unsigned } } @@ -24,7 +24,7 @@ { struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd); -@@ -73,17 +74,17 @@ static int bcm47xx_wdt_keepalive(struct +@@ -71,17 +72,17 @@ static int bcm47xx_wdt_keepalive(struct return 0; } @@ -46,7 +46,7 @@ { struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd); -@@ -93,8 +94,8 @@ static int bcm47xx_wdt_stop(struct watch +@@ -91,8 +92,8 @@ static int bcm47xx_wdt_stop(struct watch return 0; } @@ -57,7 +57,7 @@ { if (new_time < 1 || new_time > WDT_MAX_TIME) { pr_warn("timeout value must be 1<=x<=%d, using %d\n", -@@ -124,12 +125,12 @@ static int bcm47xx_wdt_notify_sys(struct +@@ -122,12 +123,12 @@ static int bcm47xx_wdt_notify_sys(struct return NOTIFY_DONE; } @@ -75,7 +75,7 @@ }; static int __devinit bcm47xx_wdt_probe(struct platform_device *pdev) -@@ -140,10 +141,10 @@ static int __devinit bcm47xx_wdt_probe(s +@@ -138,10 +139,10 @@ static int __devinit bcm47xx_wdt_probe(s if (!wdt) return -ENXIO; |