[src/trunk]: src/sys/arch dumpsys_seg: don't overwrite the previous mapping

[yamt <yamt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/03f316f4a3f4
branches:  trunk
changeset: 770730:03f316f4a3f4
user:      yamt <yamt%NetBSD.org@localhost>
date:      Mon Oct 31 12:42:36 2011 +0000

description:
dumpsys_seg: don't overwrite the previous mapping

diffstat:

 sys/arch/amd64/amd64/machdep.c |  5 +++--
 sys/arch/i386/i386/dumpsys.c   |  5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (52 lines):

diff -r bc9afa4194fa -r 03f316f4a3f4 sys/arch/amd64/amd64/machdep.c
--- a/sys/arch/amd64/amd64/machdep.c    Mon Oct 31 12:18:32 2011 +0000
+++ b/sys/arch/amd64/amd64/machdep.c    Mon Oct 31 12:42:36 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.167 2011/08/31 18:52:37 christos Exp $   */
+/*     $NetBSD: machdep.c,v 1.168 2011/10/31 12:42:36 yamt Exp $       */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -111,7 +111,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.167 2011/08/31 18:52:37 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.168 2011/10/31 12:42:36 yamt Exp $");
 
 /* #define XENDEBUG_LOW  */
 
@@ -1182,6 +1182,7 @@
                pmap_update(pmap_kernel());
 
                error = (*dump)(dumpdev, blkno, (void *)dumpspace, n);
+               pmap_kremove(dumpspace, n * PAGE_SIZE);
                if (error)
                        return error;
                maddr += n;
diff -r bc9afa4194fa -r 03f316f4a3f4 sys/arch/i386/i386/dumpsys.c
--- a/sys/arch/i386/i386/dumpsys.c      Mon Oct 31 12:18:32 2011 +0000
+++ b/sys/arch/i386/i386/dumpsys.c      Mon Oct 31 12:42:36 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dumpsys.c,v 1.12 2010/11/06 11:40:25 uebayasi Exp $    */
+/*     $NetBSD: dumpsys.c,v 1.13 2011/10/31 12:42:53 yamt Exp $        */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dumpsys.c,v 1.12 2010/11/06 11:40:25 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dumpsys.c,v 1.13 2011/10/31 12:42:53 yamt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -668,6 +668,7 @@
                pmap_update(pmap_kernel());
 
                error = (*dump)(dumpdev, blkno, (void *)dumpspace, n);
+               pmap_kremove(dumpspace, n * PAGE_SIZE);
                if (error)
                        return error;
                maddr += n;