From owner-svn-src-projects@FreeBSD.ORG  Sat Sep 12 04:49:33 2009
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 E2E9E1065676;
	Sat, 12 Sep 2009 04:49:33 +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 D23558FC14;
	Sat, 12 Sep 2009 04:49:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8C4nXwU075172;
	Sat, 12 Sep 2009 04:49:33 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8C4nXnv075170;
	Sat, 12 Sep 2009 04:49:33 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <200909120449.n8C4nXnv075170@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 12 Sep 2009 04:49:33 +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: r197112 - projects/ppc64/sys/powerpc/aim
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: Sat, 12 Sep 2009 04:49:34 -0000

Author: nwhitehorn
Date: Sat Sep 12 04:49:33 2009
New Revision: 197112
URL: http://svn.freebsd.org/changeset/base/197112

Log:
  Make physical memory map detection work on 32-bit systems again.

Modified:
  projects/ppc64/sys/powerpc/aim/ofw_machdep.c

Modified: projects/ppc64/sys/powerpc/aim/ofw_machdep.c
==============================================================================
--- projects/ppc64/sys/powerpc/aim/ofw_machdep.c	Sat Sep 12 01:37:22 2009	(r197111)
+++ projects/ppc64/sys/powerpc/aim/ofw_machdep.c	Sat Sep 12 04:49:33 2009	(r197112)
@@ -180,7 +180,7 @@ parse_ofw_memory(phandle_t node, const c
 	while (i < sz/sizeof(cell_t)) {
 	      #ifndef __powerpc64__
 		/* On 32-bit PPC, ignore regions starting above 4 GB */
-		if (OFmem[i] > 0) {
+		if (address_cells > 1 && OFmem[i] > 0) {
 			i += address_cells + size_cells;
 			continue;
 		}