Date: Fri, 16 Sep 2011 05:57:02 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r225606 - in stable: 7/sys/dev/ichwd 8/sys/dev/ichwd Message-ID: <201109160557.p8G5v2uN006654@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Fri Sep 16 05:57:01 2011 New Revision: 225606 URL: http://svn.freebsd.org/changeset/base/225606 Log: MFC r225340: Fix a bug in ichwd(4) which prevents it from being enabled if the new timeout is the same timeout. Submitted by: Dmitrij Tejblum <tejblum yandex-team.ru> PR: kern/139604 Modified: stable/7/sys/dev/ichwd/ichwd.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Changes in other areas also in this revision: Modified: stable/8/sys/dev/ichwd/ichwd.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/ichwd/ichwd.c ============================================================================== --- stable/7/sys/dev/ichwd/ichwd.c Fri Sep 16 05:45:13 2011 (r225605) +++ stable/7/sys/dev/ichwd/ichwd.c Fri Sep 16 05:57:01 2011 (r225606) @@ -319,11 +319,10 @@ ichwd_event(void *arg, unsigned int cmd, cmd &= WD_INTERVAL; timeout = ((uint64_t)1 << cmd) / ICHWD_TICK; if (cmd) { - if (timeout != sc->timeout) { - if (!sc->active) - ichwd_tmr_enable(sc); + if (!sc->active) + ichwd_tmr_enable(sc); + if (timeout != sc->timeout) ichwd_tmr_set(sc, timeout); - } ichwd_tmr_reload(sc); *error = 0; } else {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201109160557.p8G5v2uN006654>