projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
169dc38
)
misc: mei: set WDIOF_ALARMONLY on mei watchdog
author
Tomas Winkler
<
[email protected]
>
Mon, 11 Jun 2012 09:18:31 +0000
(12:18 +0300)
committer
Greg Kroah-Hartman
<
[email protected]
>
Wed, 13 Jun 2012 22:34:31 +0000
(15:34 -0700)
mei watchdog doesn't reboot the system it only produces event
therefore mark it as WDIOF_ALARMONLY.
This patch depends on:
commit
2bbeed016dd96045ec82c3a309afddcc3a0db1d2
Author: Alan Cox <
[email protected]
>
watchdog: Add a flag to indicate the watchdog doesn't reboot things
Signed-off-by: Tomas Winkler <
[email protected]
>
Signed-off-by: Greg Kroah-Hartman <
[email protected]
>
drivers/misc/mei/wd.c
patch
|
blob
|
history
diff --git
a/drivers/misc/mei/wd.c
b/drivers/misc/mei/wd.c
index 6be5605707b46036c433a7e8e441eb8b4ee1ccca..e2ec0505eb5c05458568f8d12a7cdd6d3da9939d 100644
(file)
--- a/
drivers/misc/mei/wd.c
+++ b/
drivers/misc/mei/wd.c
@@
-341,7
+341,7
@@
static const struct watchdog_ops wd_ops = {
};
static const struct watchdog_info wd_info = {
.identity = INTEL_AMT_WATCHDOG_ID,
- .options = WDIOF_KEEPALIVEPING,
+ .options = WDIOF_KEEPALIVEPING
| WDIOF_ALARMONLY
,
};
static struct watchdog_device amt_wd_dev = {