From owner-svn-src-projects@FreeBSD.ORG  Fri Jun  3 13:12:27 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 006D9106566B;
	Fri,  3 Jun 2011 13:12:26 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A23C68FC18;
	Fri,  3 Jun 2011 13:12:26 +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 p53DCQHA065371;
	Fri, 3 Jun 2011 13:12:26 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p53DCQIC065369;
	Fri, 3 Jun 2011 13:12:26 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201106031312.p53DCQIC065369@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Fri, 3 Jun 2011 13:12:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222649 - projects/pseries/powerpc/ofw
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Jun 2011 13:12:27 -0000

Author: nwhitehorn
Date: Fri Jun  3 13:12:26 2011
New Revision: 222649
URL: http://svn.freebsd.org/changeset/base/222649

Log:
  We don't need quite so many memory regions for apple_hack_mode.

Modified:
  projects/pseries/powerpc/ofw/ofw_machdep.c

Modified: projects/pseries/powerpc/ofw/ofw_machdep.c
==============================================================================
--- projects/pseries/powerpc/ofw/ofw_machdep.c	Fri Jun  3 12:02:53 2011	(r222648)
+++ projects/pseries/powerpc/ofw/ofw_machdep.c	Fri Jun  3 13:12:26 2011	(r222649)
@@ -194,7 +194,7 @@ parse_ofw_memory(phandle_t node, const c
 	 * Get memory.
 	 */
 	if ((node == -1) || (sz = OF_getprop(node, prop,
-	    OFmem, sizeof(OFmem[0]) * 4 * PHYS_AVAIL_SZ)) <= 0)
+	    OFmem, sizeof(OFmem)) <= 0)
 		panic("Physical memory map not found");
 
 	i = 0;
@@ -244,7 +244,7 @@ parse_ofw_memory(phandle_t node, const c
 	#ifdef __powerpc64__
 	if (apple_hack_mode) {
 		/* Add in regions above 4 GB to the available list */
-		struct mem_region himem[PHYS_AVAIL_SZ];
+		struct mem_region himem[16];
 		int hisz;
 
 		hisz = parse_ofw_memory(node, "reg", himem);