[src/trunk]: src/sys/arch revert previous commit. DIAGNOSTIC should only do s...

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

details:   https://anonhg.NetBSD.org/src/rev/e2881041ce64
branches:  trunk
changeset: 772574:e2881041ce64
user:      cherry <cherry%NetBSD.org@localhost>
date:      Mon Jan 09 04:39:14 2012 +0000

description:
revert previous commit. DIAGNOSTIC should only do strict checks, not muffle current ones

diffstat:

 sys/arch/x86/x86/pmap.c |   7 ++-----
 sys/arch/xen/x86/cpu.c  |  12 ++----------
 2 files changed, 4 insertions(+), 15 deletions(-)

diffs (68 lines):

diff -r 63a8a0fb13e8 -r e2881041ce64 sys/arch/x86/x86/pmap.c
--- a/sys/arch/x86/x86/pmap.c   Mon Jan 09 02:52:50 2012 +0000
+++ b/sys/arch/x86/x86/pmap.c   Mon Jan 09 04:39:14 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.150 2012/01/06 15:15:27 cherry Exp $        */
+/*     $NetBSD: pmap.c,v 1.151 2012/01/09 04:39:14 cherry Exp $        */
 
 /*-
  * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.150 2012/01/06 15:15:27 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.151 2012/01/09 04:39:14 cherry Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -2120,9 +2120,6 @@
        for (i = 0; i < PDP_SIZE; i++, object += PAGE_SIZE) {
                (void) pmap_extract(pmap_kernel(), object, &pdirpa);
                /* FIXME: This should use pmap_protect() .. */
-#ifdef DIAGNOSTIC
-               pmap_kremove(object, PAGE_SIZE);
-#endif /* DIAGNOSTIC */
                pmap_kenter_pa(object, pdirpa, VM_PROT_READ, 0);
                pmap_update(pmap_kernel());
                /*
diff -r 63a8a0fb13e8 -r e2881041ce64 sys/arch/xen/x86/cpu.c
--- a/sys/arch/xen/x86/cpu.c    Mon Jan 09 02:52:50 2012 +0000
+++ b/sys/arch/xen/x86/cpu.c    Mon Jan 09 04:39:14 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.76 2012/01/06 15:15:28 cherry Exp $  */
+/*     $NetBSD: cpu.c,v 1.77 2012/01/09 04:39:14 cherry Exp $  */
 /* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp  */
 
 /*-
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.76 2012/01/06 15:15:28 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.77 2012/01/09 04:39:14 cherry Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -1307,10 +1307,6 @@
 #endif /* __x86_64__ else PAE */
 
        /* Xen wants R/O */
-       /* FIXME: This should use pmap_protect() .. */
-#ifdef DIAGNOSTIC
-       pmap_kremove((vaddr_t)ci->ci_kpm_pdir, PAGE_SIZE);
-#endif /* DIAGNOSTIC */
        pmap_kenter_pa((vaddr_t)ci->ci_kpm_pdir, ci->ci_kpm_pdirpa,
            VM_PROT_READ, 0);
 
@@ -1323,10 +1319,6 @@
        ci->ci_pae_l3_pdir[3] = xpmap_ptom_masked(ci->ci_kpm_pdirpa) | PG_k | PG_V;
 
        /* Mark L3 R/O (Xen wants this) */
-#ifdef DIAGNOSTIC
-       /* FIXME: This should use pmap_protect() .. */
-       pmap_kremove((vaddr_t)ci->ci_pae_l3_pdir, PAGE_SIZE);
-#endif /* DIAGNOSTIC */
        pmap_kenter_pa((vaddr_t)ci->ci_pae_l3_pdir, ci->ci_pae_l3_pdirpa,
                VM_PROT_READ, 0);