From owner-svn-src-all@FreeBSD.ORG Mon Jun 4 19:40:52 2012 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6CC9F10656A6; Mon, 4 Jun 2012 19:40:52 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 5DAEF8FC20; Mon, 4 Jun 2012 19:40:51 +0000 (UTC) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id WAA11348; Mon, 04 Jun 2012 22:40:50 +0300 (EEST) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1Sbd8z-0000u0-MT; Mon, 04 Jun 2012 22:40:49 +0300 Message-ID: <4FCD0F41.4030709@FreeBSD.org> Date: Mon, 04 Jun 2012 22:40:49 +0300 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:12.0) Gecko/20120503 Thunderbird/12.0.1 MIME-Version: 1.0 To: src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org References: <201206030801.q5381D7Y043823@svn.freebsd.org> In-Reply-To: <201206030801.q5381D7Y043823@svn.freebsd.org> X-Enigmail-Version: 1.5pre Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: Subject: Re: svn commit: r236503 - in head/sys: amd64/amd64 i386/i386 kern x86/x86 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jun 2012 19:40:52 -0000 on 03/06/2012 11:01 Andriy Gapon said the following: > Author: avg > Date: Sun Jun 3 08:01:12 2012 > New Revision: 236503 > URL: http://svn.freebsd.org/changeset/base/236503 > > Log: > free wdog_kern_pat calls in post-panic paths from under SW_WATCHDOG > > Those calls are useful with hardware watchdog drivers too. Failed to mention: Reviewed by: attilio > MFC after: 3 weeks > > Modified: > head/sys/amd64/amd64/minidump_machdep.c > head/sys/i386/i386/minidump_machdep.c > head/sys/kern/kern_shutdown.c > head/sys/kern/vfs_subr.c > head/sys/x86/x86/dump_machdep.c > > Modified: head/sys/amd64/amd64/minidump_machdep.c > ============================================================================== > --- head/sys/amd64/amd64/minidump_machdep.c Sun Jun 3 07:45:42 2012 (r236502) > +++ head/sys/amd64/amd64/minidump_machdep.c Sun Jun 3 08:01:12 2012 (r236503) > @@ -37,9 +37,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > -#ifdef SW_WATCHDOG > #include > -#endif > #include > #include > #include > @@ -177,9 +175,9 @@ blk_write(struct dumperinfo *di, char *p > report_progress(progress, dumpsize); > counter &= (1<<24) - 1; > } > -#ifdef SW_WATCHDOG > + > wdog_kern_pat(WD_LASTVAL); > -#endif > + > if (ptr) { > error = dump_write(di, ptr, 0, dumplo, len); > if (error) > > Modified: head/sys/i386/i386/minidump_machdep.c > ============================================================================== > --- head/sys/i386/i386/minidump_machdep.c Sun Jun 3 07:45:42 2012 (r236502) > +++ head/sys/i386/i386/minidump_machdep.c Sun Jun 3 08:01:12 2012 (r236503) > @@ -36,9 +36,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > -#ifdef SW_WATCHDOG > #include > -#endif > #include > #include > #include > @@ -143,9 +141,9 @@ blk_write(struct dumperinfo *di, char *p > printf(" %lld", PG2MB(progress >> PAGE_SHIFT)); > counter &= (1<<24) - 1; > } > -#ifdef SW_WATCHDOG > + > wdog_kern_pat(WD_LASTVAL); > -#endif > + > if (ptr) { > error = dump_write(di, ptr, 0, dumplo, len); > if (error) > > Modified: head/sys/kern/kern_shutdown.c > ============================================================================== > --- head/sys/kern/kern_shutdown.c Sun Jun 3 07:45:42 2012 (r236502) > +++ head/sys/kern/kern_shutdown.c Sun Jun 3 08:01:12 2012 (r236503) > @@ -66,9 +66,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > -#ifdef SW_WATCHDOG > #include > -#endif > > #include > > @@ -334,9 +332,7 @@ kern_reboot(int howto) > > waittime = 0; > > -#ifdef SW_WATCHDOG > wdog_kern_pat(WD_LASTVAL); > -#endif > sys_sync(curthread, NULL); > > /* > @@ -362,9 +358,8 @@ kern_reboot(int howto) > if (nbusy < pbusy) > iter = 0; > pbusy = nbusy; > -#ifdef SW_WATCHDOG > + > wdog_kern_pat(WD_LASTVAL); > -#endif > sys_sync(curthread, NULL); > > #ifdef PREEMPTION > > Modified: head/sys/kern/vfs_subr.c > ============================================================================== > --- head/sys/kern/vfs_subr.c Sun Jun 3 07:45:42 2012 (r236502) > +++ head/sys/kern/vfs_subr.c Sun Jun 3 08:01:12 2012 (r236503) > @@ -73,9 +73,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > -#ifdef SW_WATCHDOG > #include > -#endif > > #include > > @@ -1869,10 +1867,10 @@ sched_sync(void) > LIST_INSERT_HEAD(next, bo, bo_synclist); > continue; > } > -#ifdef SW_WATCHDOG > + > if (first_printf == 0) > wdog_kern_pat(WD_LASTVAL); > -#endif > + > } > if (!LIST_EMPTY(gslp)) { > mtx_unlock(&sync_mtx); > > Modified: head/sys/x86/x86/dump_machdep.c > ============================================================================== > --- head/sys/x86/x86/dump_machdep.c Sun Jun 3 07:45:42 2012 (r236502) > +++ head/sys/x86/x86/dump_machdep.c Sun Jun 3 08:01:12 2012 (r236503) > @@ -36,9 +36,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > -#ifdef SW_WATCHDOG > #include > -#endif > #include > #include > #include > @@ -198,9 +196,9 @@ cb_dumpdata(struct md_pa *mdp, int seqnr > a = pa + i * PAGE_SIZE; > va = pmap_kenter_temporary(trunc_page(a), i); > } > -#ifdef SW_WATCHDOG > + > wdog_kern_pat(WD_LASTVAL); > -#endif > + > error = dump_write(di, va, 0, dumplo, sz); > if (error) > break; -- Andriy Gapon