From a4c79ce346b7b8133ef24a56f21807f8f0b53ae1 Mon Sep 17 00:00:00 2001 From: tsutsui Date: Thu, 2 Jun 2005 14:56:58 +0000 Subject: [PATCH] Fix a shadow warning. --- sys/arch/m68k/m68k/pmap_motorola.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/arch/m68k/m68k/pmap_motorola.c b/sys/arch/m68k/m68k/pmap_motorola.c index d5071b9ff9e0..97dbdf97cd45 100644 --- a/sys/arch/m68k/m68k/pmap_motorola.c +++ b/sys/arch/m68k/m68k/pmap_motorola.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_motorola.c,v 1.14 2005/04/01 11:59:32 yamt Exp $ */ +/* $NetBSD: pmap_motorola.c,v 1.15 2005/06/02 14:56:58 tsutsui Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -124,7 +124,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.14 2005/04/01 11:59:32 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.15 2005/06/02 14:56:58 tsutsui Exp $"); #include "opt_compat_hpux.h" @@ -2255,13 +2255,13 @@ pmap_remove_mapping(pmap, va, pte, flags) #ifdef DIAGNOSTIC struct pv_entry *pv; #endif - paddr_t pa; + paddr_t ptppa; - pa = pmap_pte_pa(pmap_pte(pmap_kernel(), ptpva)); + ptppa = pmap_pte_pa(pmap_pte(pmap_kernel(), ptpva)); #ifdef DIAGNOSTIC - if (PAGE_IS_MANAGED(pa) == 0) + if (PAGE_IS_MANAGED(ptppa) == 0) panic("pmap_remove_mapping: unmanaged PT page"); - pv = pa_to_pvh(pa); + pv = pa_to_pvh(ptppa); if (pv->pv_ptste == NULL) panic("pmap_remove_mapping: ptste == NULL"); if (pv->pv_pmap != pmap_kernel() || @@ -2273,10 +2273,10 @@ pmap_remove_mapping(pmap, va, pte, flags) #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(ptppa)); PMAP_DPRINTF(PDB_REMOVE|PDB_PTPAGE, ("remove: PT page 0x%lx (0x%lx) freed\n", - ptpva, pa)); + ptpva, ptppa)); } }