aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.6/542-watchdog-bcm47xx_wdt.c-rename-ops-methods.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-11-24 20:24:27 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2012-11-24 20:24:27 +0000
commit264873b3c551b2577a953d34b04107bda47fddce (patch)
tree12494fdcd20bc57bd5cba0764bbdadf11af772a9 /target/linux/brcm47xx/patches-3.6/542-watchdog-bcm47xx_wdt.c-rename-ops-methods.patch
parentc62d86ecb87f695d9065a29e6ec4cd49ea5f21ad (diff)
downloadupstream-264873b3c551b2577a953d34b04107bda47fddce.tar.gz
upstream-264873b3c551b2577a953d34b04107bda47fddce.tar.bz2
upstream-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/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.patch14
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 54956fd2d7..8d85303e4b 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;