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/541-watchdog-bcm47xx_wdt.c-use-platform-device.patch | |
| parent | afc3c7596af4c3e52d3783732babdfb7b60009b7 (diff) | |
| download | master-187ad058-dfc7942c3e89e94d3f22b9d80827d39a22719c40.tar.gz master-187ad058-dfc7942c3e89e94d3f22b9d80827d39a22719c40.tar.bz2 master-187ad058-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/541-watchdog-bcm47xx_wdt.c-use-platform-device.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.6/541-watchdog-bcm47xx_wdt.c-use-platform-device.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/541-watchdog-bcm47xx_wdt.c-use-platform-device.patch b/target/linux/brcm47xx/patches-3.6/541-watchdog-bcm47xx_wdt.c-use-platform-device.patch index 79bb962f78..593aace7f7 100644 --- a/target/linux/brcm47xx/patches-3.6/541-watchdog-bcm47xx_wdt.c-use-platform-device.patch +++ b/target/linux/brcm47xx/patches-3.6/541-watchdog-bcm47xx_wdt.c-use-platform-device.patch @@ -30,9 +30,9 @@ #define DRV_NAME "bcm47xx_wdt" -@@ -45,48 +46,19 @@ MODULE_PARM_DESC(nowayout, +@@ -43,48 +44,19 @@ MODULE_PARM_DESC(nowayout, + "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); - #endif -static struct timer_list wdt_timer; -static atomic_t ticks; @@ -87,7 +87,7 @@ } else { pr_crit("Watchdog will fire soon!!!\n"); } -@@ -94,23 +66,29 @@ static void bcm47xx_timer_tick(unsigned +@@ -92,23 +64,29 @@ static void bcm47xx_timer_tick(unsigned static int bcm47xx_wdt_keepalive(struct watchdog_device *wdd) { @@ -122,7 +122,7 @@ return 0; } -@@ -118,10 +96,13 @@ static int bcm47xx_wdt_stop(struct watch +@@ -116,10 +94,13 @@ static int bcm47xx_wdt_stop(struct watch static int bcm47xx_wdt_set_timeout(struct watchdog_device *wdd, unsigned int new_time) { @@ -138,7 +138,7 @@ return 0; } -@@ -135,8 +116,11 @@ static const struct watchdog_info bcm47x +@@ -133,8 +114,11 @@ static const struct watchdog_info bcm47x static int bcm47xx_wdt_notify_sys(struct notifier_block *this, unsigned long code, void *unused) { @@ -151,7 +151,7 @@ return NOTIFY_DONE; } -@@ -148,57 +132,72 @@ static struct watchdog_ops bcm47xx_wdt_o +@@ -146,57 +130,72 @@ static struct watchdog_ops bcm47xx_wdt_o .set_timeout = bcm47xx_wdt_set_timeout, }; |