CVS commit: src/sys/arch/evbarm/marvell

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Wed Dec 12 00:03:12 UTC 2012

Modified Files:
        src/sys/arch/evbarm/marvell: marvell_machdep.c

Log Message:
Change physical_end to segment_end to avoid shadowing a global.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/marvell/marvell_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/evbarm/marvell/marvell_machdep.c
diff -u src/sys/arch/evbarm/marvell/marvell_machdep.c:1.20 src/sys/arch/evbarm/marvell/marvell_machdep.c:1.21
--- src/sys/arch/evbarm/marvell/marvell_machdep.c:1.20	Sun Dec  2 18:20:20 2012
+++ src/sys/arch/evbarm/marvell/marvell_machdep.c	Wed Dec 12 00:03:11 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: marvell_machdep.c,v 1.20 2012/12/02 18:20:20 msaitoh Exp $ */
+/*	$NetBSD: marvell_machdep.c,v 1.21 2012/12/12 00:03:11 matt Exp $ */
 /*
  * Copyright (c) 2007, 2008, 2010 KIYOHARA Takashi
  * All rights reserved.
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: marvell_machdep.c,v 1.20 2012/12/02 18:20:20 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: marvell_machdep.c,v 1.21 2012/12/12 00:03:11 matt Exp $");
 
 #include "opt_evbarm_boardtype.h"
 #include "opt_ddb.h"
@@ -349,8 +349,8 @@ initarm(void *arg)
 #endif
 
 	bootconfig.dramblocks = 0;
-	paddr_t physical_end;
-	physical_end = physmem = 0;
+	paddr_t segment_end;
+	segment_end = physmem = 0;
 	for (cs = MARVELL_TAG_SDRAM_CS0; cs <= MARVELL_TAG_SDRAM_CS3; cs++) {
 		mvsoc_target(cs, &target, &attr, &base, &size);
 		if (size == 0)
@@ -359,16 +359,16 @@ initarm(void *arg)
 		bootconfig.dram[bootconfig.dramblocks].address = base;
 		bootconfig.dram[bootconfig.dramblocks].pages = size / PAGE_SIZE;
 
-		if (base != physical_end)
+		if (base != segment_end)
 			panic("memory hole not support");
 
-		physical_end += size;
+		segment_end += size;
 		physmem += size / PAGE_SIZE;
 
 		bootconfig.dramblocks++;
 	}
 
-	arm32_bootmem_init(0, physical_end, (uintptr_t) KERNEL_BASE_phys);
+	arm32_bootmem_init(0, segment_end, (uintptr_t) KERNEL_BASE_phys);
 	arm32_kernel_vm_init(KERNEL_VM_BASE, ARM_VECTORS_HIGH, 0,
 	    marvell_devmap, false);