From owner-svn-src-all@FreeBSD.ORG  Fri Jun 15 07:26:39 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BDB721065674;
	Fri, 15 Jun 2012 07:26:39 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id AA20A8FC1B;
	Fri, 15 Jun 2012 07:26:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5F7QdWq051172;
	Fri, 15 Jun 2012 07:26:39 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5F7Qd4A051170;
	Fri, 15 Jun 2012 07:26:39 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201206150726.q5F7Qd4A051170@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 15 Jun 2012 07:26:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237118 - head/sys/arm/arm
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Jun 2012 07:26:39 -0000

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;
 }