diff options
| author | glebius <glebius@FreeBSD.org> | 2013-11-14 09:11:54 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2013-11-14 09:11:54 +0000 |
| commit | fa658a0f7232de870d75a11f6dc89e300cdbb738 (patch) | |
| tree | c0a5553768950ec9bcb3a34736ce175beeceeaed | |
| parent | ef65f230b04e99b52b21e7d1fd0ca8073387fb47 (diff) | |
| download | FreeBSD-src-fa658a0f7232de870d75a11f6dc89e300cdbb738.zip FreeBSD-src-fa658a0f7232de870d75a11f6dc89e300cdbb738.tar.gz | |
Merge r257421 from head:
Provide a crutch that prevents watchdog to interrupt dumping
on a box with IPMI enabled.
Approved by: re (kib)
| -rw-r--r-- | sys/dev/ipmi/ipmi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/dev/ipmi/ipmi.c b/sys/dev/ipmi/ipmi.c index c42805d..5e30770 100644 --- a/sys/dev/ipmi/ipmi.c +++ b/sys/dev/ipmi/ipmi.c @@ -647,6 +647,9 @@ ipmi_wd_event(void *arg, unsigned int cmd, int *error) unsigned int timeout; int e; + if (dumping) + return; + cmd &= WD_INTERVAL; if (cmd > 0 && cmd <= 63) { timeout = ((uint64_t)1 << cmd) / 1000000000; |
