Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/arc/arc Fix for gcc -Wshadow.



details:   https://anonhg.NetBSD.org/src/rev/5b0266bf3e0c
branches:  trunk
changeset: 581632:5b0266bf3e0c
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Fri Jun 03 12:29:00 2005 +0000

description:
Fix for gcc -Wshadow.

diffstat:

 sys/arch/arc/arc/arcbios.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (50 lines):

diff -r 86b733153e62 -r 5b0266bf3e0c sys/arch/arc/arc/arcbios.c
--- a/sys/arch/arc/arc/arcbios.c        Fri Jun 03 12:28:47 2005 +0000
+++ b/sys/arch/arc/arc/arcbios.c        Fri Jun 03 12:29:00 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: arcbios.c,v 1.13 2005/01/22 07:35:33 tsutsui Exp $     */
+/*     $NetBSD: arcbios.c,v 1.14 2005/06/03 12:29:00 tsutsui Exp $     */
 /*     $OpenBSD: arcbios.c,v 1.3 1998/06/06 06:33:33 mickey Exp $      */
 
 /*-
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arcbios.c,v 1.13 2005/01/22 07:35:33 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arcbios.c,v 1.14 2005/06/03 12:29:00 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -182,7 +182,7 @@
 bios_configure_memory(int *mem_reserved, phys_ram_seg_t *mem_clusters,
     int *mem_cluster_cnt_return)
 {
-       int physmem = 0;                /* Total physical memory size */
+       int bios_physmem = 0;           /* Total physical memory size */
        int mem_cluster_cnt = 0;
 
        arc_mem_t *descr = NULL;
@@ -215,7 +215,7 @@
                case FreeContigous:
                        reserved = 0;
 account_it:
-                       physmem += descr->PageCount * 4096;
+                       bios_physmem += descr->PageCount * 4096;
 
                        for (i = 0; i < mem_cluster_cnt; ) {
                                if (mem_reserved[i] == reserved &&
@@ -256,11 +256,11 @@
                    mem_reserved[i],
                    (long)mem_clusters[i].start,
                    (long)mem_clusters[i].size);
-       printf("physmem = %d\n", physmem);
+       printf("physmem = %d\n", bios_physmem);
 #endif
 
        *mem_cluster_cnt_return = mem_cluster_cnt;
-       return physmem;
+       return bios_physmem;
 }
 
 /*



Home | Main Index | Thread Index | Old Index