Module Name: src Committed By: snj Date: Wed Jul 5 20:23:09 UTC 2017
Modified Files: src/sys/arch/x86/x86 [netbsd-8]: pmap.c Log Message: Pull up following revision(s) (requested by jdolecek in ticket #98): sys/arch/x86/x86/pmap.c: revision 1.252 remove panicstr KASSERT() in pmap_kremove_local() - kernel dump can legitimely invoked also without panic - via reboot -d fixes PR kern/49610 by Manuel Bouyer To generate a diff of this commit: cvs rdiff -u -r1.245 -r1.245.6.1 src/sys/arch/x86/x86/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/x86/x86/pmap.c diff -u src/sys/arch/x86/x86/pmap.c:1.245 src/sys/arch/x86/x86/pmap.c:1.245.6.1 --- src/sys/arch/x86/x86/pmap.c:1.245 Fri Mar 24 10:58:06 2017 +++ src/sys/arch/x86/x86/pmap.c Wed Jul 5 20:23:08 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.245 2017/03/24 10:58:06 maxv Exp $ */ +/* $NetBSD: pmap.c,v 1.245.6.1 2017/07/05 20:23:08 snj Exp $ */ /*- * Copyright (c) 2008, 2010, 2016, 2017 The NetBSD Foundation, Inc. @@ -171,7 +171,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.245 2017/03/24 10:58:06 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.245.6.1 2017/07/05 20:23:08 snj Exp $"); #include "opt_user_ldt.h" #include "opt_lockdebug.h" @@ -1146,14 +1146,13 @@ pmap_kremove(vaddr_t sva, vsize_t len) /* * pmap_kremove_local: like pmap_kremove(), but only worry about * TLB invalidations on the current CPU. this is only intended - * for use while writing kernel crash dumps. + * for use while writing kernel crash dumps, either after panic + * or via reboot -d. */ void pmap_kremove_local(vaddr_t sva, vsize_t len) { - - KASSERT(panicstr != NULL); pmap_kremove1(sva, len, true); }