Fix a variable shadowing
This commit is contained in:
parent
1786cf4f46
commit
96fe97a4ff
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: pmap.c,v 1.113 2005/05/29 15:56:59 chs Exp $ */
|
||||
/* $NetBSD: pmap.c,v 1.114 2005/06/13 20:43:16 jmc Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999 The NetBSD Foundation, Inc.
|
||||
@ -107,7 +107,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.113 2005/05/29 15:56:59 chs Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.114 2005/06/13 20:43:16 jmc Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
@ -2086,31 +2086,31 @@ pmap_remove_mapping(pmap, va, pte, flags)
|
||||
*/
|
||||
if (refs == 0 && (flags & PRM_KEEPPTPAGE) == 0) {
|
||||
#ifdef DIAGNOSTIC
|
||||
struct pv_entry *pv;
|
||||
struct pv_entry *_pv;
|
||||
#endif
|
||||
paddr_t pa;
|
||||
paddr_t _pa;
|
||||
|
||||
pa = pmap_pte_pa(pmap_pte(pmap_kernel(), ptpva));
|
||||
_pa = pmap_pte_pa(pmap_pte(pmap_kernel(), ptpva));
|
||||
#ifdef DIAGNOSTIC
|
||||
if (PAGE_IS_MANAGED(pa) == 0)
|
||||
if (PAGE_IS_MANAGED(_pa) == 0)
|
||||
panic("pmap_remove_mapping: unmanaged PT page");
|
||||
pv = pa_to_pvh(pa);
|
||||
if (pv->pv_ptste == NULL)
|
||||
_pv = pa_to_pvh(_pa);
|
||||
if (_pv->pv_ptste == NULL)
|
||||
panic("pmap_remove_mapping: ptste == NULL");
|
||||
if (pv->pv_pmap != pmap_kernel() ||
|
||||
pv->pv_va != ptpva ||
|
||||
pv->pv_next != NULL)
|
||||
if (_pv->pv_pmap != pmap_kernel() ||
|
||||
_pv->pv_va != ptpva ||
|
||||
_pv->pv_next != NULL)
|
||||
panic("pmap_remove_mapping: "
|
||||
"bad PT page pmap %p, va 0x%lx, next %p",
|
||||
pv->pv_pmap, pv->pv_va, pv->pv_next);
|
||||
_pv->pv_pmap, _pv->pv_va, _pv->pv_next);
|
||||
#endif
|
||||
pmap_remove_mapping(pmap_kernel(), ptpva,
|
||||
NULL, PRM_TFLUSH|PRM_CFLUSH);
|
||||
uvm_pagefree(PHYS_TO_VM_PAGE(pa));
|
||||
uvm_pagefree(PHYS_TO_VM_PAGE(_pa));
|
||||
#ifdef DEBUG
|
||||
if (pmapdebug & (PDB_REMOVE|PDB_PTPAGE))
|
||||
printf("remove: PT page 0x%lx (0x%lx) freed\n",
|
||||
ptpva, pa);
|
||||
ptpva, _pa);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user