svn commit: r237118 - head/sys/arm/arm

[Warner Losh]

Author: imp
Date: Fri Jun 15 07:26:39 2012
New Revision: 237118
URL: http://svn.freebsd.org/changeset/base/237118

Log:
  Fix a global shadowing problem when LINUX_BOOT_ABI was defined.

Modified:
  head/sys/arm/arm/machdep.c

Modified: head/sys/arm/arm/machdep.c
==============================================================================
--- head/sys/arm/arm/machdep.c	Fri Jun 15 07:14:43 2012	(r237117)
+++ head/sys/arm/arm/machdep.c	Fri Jun 15 07:26:39 2012	(r237118)
@@ -686,7 +686,7 @@ makectx(struct trapframe *tf, struct pcb
  * calling pmap_bootstrap.
  */
 void
-arm_dump_avail_init(vm_offset_t memsize, size_t max)
+arm_dump_avail_init(vm_offset_t ramsize, size_t max)
 {
 #ifdef LINUX_BOOT_ABI
 	/*
@@ -713,7 +713,7 @@ arm_dump_avail_init(vm_offset_t memsize,
 		panic("dump_avail too small\n");
 
 	dump_avail[0] = round_page(PHYSADDR);
-	dump_avail[1] = trunc_page(PHYSADDR + memsize);
+	dump_avail[1] = trunc_page(PHYSADDR + ramsize);
 	dump_avail[2] = 0;
 	dump_avail[3] = 0;
 }