Date: Sat, 30 Jun 2012 14:18:00 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r237839 - in stable/9/sys: amd64/amd64 i386/i386 kern x86/x86 Message-ID: <201206301418.q5UEI06V023604@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Sat Jun 30 14:17:59 2012 New Revision: 237839 URL: http://svn.freebsd.org/changeset/base/237839 Log: MFC r236503: free wdog_kern_pat calls in post-panic paths from under SW_WATCHDOG Modified: stable/9/sys/amd64/amd64/minidump_machdep.c stable/9/sys/i386/i386/minidump_machdep.c stable/9/sys/kern/kern_shutdown.c stable/9/sys/kern/vfs_subr.c stable/9/sys/x86/x86/dump_machdep.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) stable/9/sys/dev/ (props changed) stable/9/sys/dev/e1000/ (props changed) stable/9/sys/dev/isp/ (props changed) stable/9/sys/dev/ixgbe/ (props changed) stable/9/sys/fs/ (props changed) stable/9/sys/fs/ntfs/ (props changed) stable/9/sys/modules/ (props changed) Modified: stable/9/sys/amd64/amd64/minidump_machdep.c ============================================================================== --- stable/9/sys/amd64/amd64/minidump_machdep.c Sat Jun 30 14:06:17 2012 (r237838) +++ stable/9/sys/amd64/amd64/minidump_machdep.c Sat Jun 30 14:17:59 2012 (r237839) @@ -37,9 +37,7 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/kerneldump.h> #include <sys/msgbuf.h> -#ifdef SW_WATCHDOG #include <sys/watchdog.h> -#endif #include <vm/vm.h> #include <vm/vm_page.h> #include <vm/pmap.h> @@ -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: stable/9/sys/i386/i386/minidump_machdep.c ============================================================================== --- stable/9/sys/i386/i386/minidump_machdep.c Sat Jun 30 14:06:17 2012 (r237838) +++ stable/9/sys/i386/i386/minidump_machdep.c Sat Jun 30 14:17:59 2012 (r237839) @@ -36,9 +36,7 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/kerneldump.h> #include <sys/msgbuf.h> -#ifdef SW_WATCHDOG #include <sys/watchdog.h> -#endif #include <vm/vm.h> #include <vm/pmap.h> #include <machine/atomic.h> @@ -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: stable/9/sys/kern/kern_shutdown.c ============================================================================== --- stable/9/sys/kern/kern_shutdown.c Sat Jun 30 14:06:17 2012 (r237838) +++ stable/9/sys/kern/kern_shutdown.c Sat Jun 30 14:17:59 2012 (r237839) @@ -66,9 +66,7 @@ __FBSDID("$FreeBSD$"); #include <sys/sysctl.h> #include <sys/sysproto.h> #include <sys/vnode.h> -#ifdef SW_WATCHDOG #include <sys/watchdog.h> -#endif #include <ddb/ddb.h> @@ -331,9 +329,7 @@ kern_reboot(int howto) waittime = 0; -#ifdef SW_WATCHDOG wdog_kern_pat(WD_LASTVAL); -#endif sys_sync(curthread, NULL); /* @@ -359,9 +355,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: stable/9/sys/kern/vfs_subr.c ============================================================================== --- stable/9/sys/kern/vfs_subr.c Sat Jun 30 14:06:17 2012 (r237838) +++ stable/9/sys/kern/vfs_subr.c Sat Jun 30 14:17:59 2012 (r237839) @@ -73,9 +73,7 @@ __FBSDID("$FreeBSD$"); #include <sys/syslog.h> #include <sys/vmmeter.h> #include <sys/vnode.h> -#ifdef SW_WATCHDOG #include <sys/watchdog.h> -#endif #include <machine/stdarg.h> @@ -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: stable/9/sys/x86/x86/dump_machdep.c ============================================================================== --- stable/9/sys/x86/x86/dump_machdep.c Sat Jun 30 14:06:17 2012 (r237838) +++ stable/9/sys/x86/x86/dump_machdep.c Sat Jun 30 14:17:59 2012 (r237839) @@ -36,9 +36,7 @@ __FBSDID("$FreeBSD$"); #include <sys/sysctl.h> #include <sys/kernel.h> #include <sys/kerneldump.h> -#ifdef SW_WATCHDOG #include <sys/watchdog.h> -#endif #include <vm/vm.h> #include <vm/pmap.h> #include <machine/elf.h> @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206301418.q5UEI06V023604>