Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/m68k/m68k Fix a shadow warning.



details:   https://anonhg.NetBSD.org/src/rev/3cd88f5650ec
branches:  trunk
changeset: 581557:3cd88f5650ec
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Thu Jun 02 14:56:58 2005 +0000

description:
Fix a shadow warning.

diffstat:

 sys/arch/m68k/m68k/pmap_motorola.c |  18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diffs (50 lines):

diff -r 377e855686b2 -r 3cd88f5650ec sys/arch/m68k/m68k/pmap_motorola.c
--- a/sys/arch/m68k/m68k/pmap_motorola.c        Thu Jun 02 14:51:32 2005 +0000
+++ b/sys/arch/m68k/m68k/pmap_motorola.c        Thu Jun 02 14:56:58 2005 +0000
@@ -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 <sys/cdefs.h>
-__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 @@
 #ifdef DIAGNOSTIC
                        struct pv_entry *pv;
 #endif
-                       paddr_t pa;
-
-                       pa = pmap_pte_pa(pmap_pte(pmap_kernel(), ptpva));
+                       paddr_t ptppa;
+
+                       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 @@
 #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));
                }
        }
 



Home | Main Index | Thread Index | Old Index