Date: Thu, 14 Nov 2013 09:11:54 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r258120 - stable/10/sys/dev/ipmi Message-ID: <201311140911.rAE9BsWk039802@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Thu Nov 14 09:11:54 2013 New Revision: 258120 URL: http://svnweb.freebsd.org/changeset/base/258120 Log: Merge r257421 from head: Provide a crutch that prevents watchdog to interrupt dumping on a box with IPMI enabled. Approved by: re (kib) Modified: stable/10/sys/dev/ipmi/ipmi.c Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/dev/ipmi/ipmi.c ============================================================================== --- stable/10/sys/dev/ipmi/ipmi.c Thu Nov 14 07:41:52 2013 (r258119) +++ stable/10/sys/dev/ipmi/ipmi.c Thu Nov 14 09:11:54 2013 (r258120) @@ -647,6 +647,9 @@ ipmi_wd_event(void *arg, unsigned int cm unsigned int timeout; int e; + if (dumping) + return; + cmd &= WD_INTERVAL; if (cmd > 0 && cmd <= 63) { timeout = ((uint64_t)1 << cmd) / 1000000000;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311140911.rAE9BsWk039802>