From owner-svn-src-projects@FreeBSD.ORG  Fri Mar 12 02:55:10 2010
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 91228106568F;
	Fri, 12 Mar 2010 02:55:10 +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 805228FC18;
	Fri, 12 Mar 2010 02:55:10 +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 o2C2tA4K068875;
	Fri, 12 Mar 2010 02:55:10 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2C2tAhg068873;
	Fri, 12 Mar 2010 02:55:10 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201003120255.o2C2tAhg068873@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Fri, 12 Mar 2010 02:55:10 +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: r205060 - 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: Fri, 12 Mar 2010 02:55:10 -0000

Author: nwhitehorn
Date: Fri Mar 12 02:55:10 2010
New Revision: 205060
URL: http://svn.freebsd.org/changeset/base/205060

Log:
  In the event there are no mappings in segment 16 (e.g. for real-mode OF),
  make sure we don't go too far.

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

Modified: projects/ppc64/sys/powerpc/aim/mmu_oea64.c
==============================================================================
--- projects/ppc64/sys/powerpc/aim/mmu_oea64.c	Fri Mar 12 01:51:39 2010	(r205059)
+++ projects/ppc64/sys/powerpc/aim/mmu_oea64.c	Fri Mar 12 02:55:10 2010	(r205060)
@@ -1055,7 +1055,8 @@ moea64_bridge_bootstrap(mmu_t mmup, vm_o
 	 */
 
 	PMAP_LOCK(kernel_pmap);
-	while (moea64_pvo_find_va(kernel_pmap, virtual_end+1, NULL) == NULL)
+	while (virtual_end < VM_MAX_KERNEL_ADDRESS &&
+	    moea64_pvo_find_va(kernel_pmap, virtual_end+1, NULL) == NULL)
 		virtual_end += PAGE_SIZE;
 	PMAP_UNLOCK(kernel_pmap);