Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
cherry 2012-01-09 04:39:14 +00:00
parent 9dc21a478b
commit d515295709
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/arch/x86/x86/pmap.c
View File

@ -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. * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@ -171,7 +171,7 @@
*/ */
#include <sys/cdefs.h> #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_user_ldt.h"
#include "opt_lockdebug.h" #include "opt_lockdebug.h"
@ -2120,9 +2120,6 @@ pmap_pdp_ctor(void *arg, void *v, int flags)
for (i = 0; i < PDP_SIZE; i++, object += PAGE_SIZE) { for (i = 0; i < PDP_SIZE; i++, object += PAGE_SIZE) {
(void) pmap_extract(pmap_kernel(), object, &pdirpa); (void) pmap_extract(pmap_kernel(), object, &pdirpa);
/* FIXME: This should use pmap_protect() .. */ /* 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_kenter_pa(object, pdirpa, VM_PROT_READ, 0);
pmap_update(pmap_kernel()); pmap_update(pmap_kernel());
/* /*

12
sys/arch/xen/x86/cpu.c
View File

@ -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 */ /* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp */
/*- /*-
@ -66,7 +66,7 @@
*/ */
#include <sys/cdefs.h> #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_ddb.h"
#include "opt_multiprocessor.h" #include "opt_multiprocessor.h"
@ -1307,10 +1307,6 @@ pmap_cpu_init_late(struct cpu_info *ci)
#endif /* __x86_64__ else PAE */ #endif /* __x86_64__ else PAE */
/* Xen wants R/O */ /* 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, pmap_kenter_pa((vaddr_t)ci->ci_kpm_pdir, ci->ci_kpm_pdirpa,
VM_PROT_READ, 0); VM_PROT_READ, 0);
@ -1323,10 +1319,6 @@ pmap_cpu_init_late(struct cpu_info *ci)
ci->ci_pae_l3_pdir[3] = xpmap_ptom_masked(ci->ci_kpm_pdirpa) | PG_k | PG_V; ci->ci_pae_l3_pdir[3] = xpmap_ptom_masked(ci->ci_kpm_pdirpa) | PG_k | PG_V;
/* Mark L3 R/O (Xen wants this) */ /* 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, pmap_kenter_pa((vaddr_t)ci->ci_pae_l3_pdir, ci->ci_pae_l3_pdirpa,
VM_PROT_READ, 0); VM_PROT_READ, 0);