From owner-svn-src-projects@FreeBSD.ORG  Tue Sep  8 04:06:41 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 CC6081065670;
	Tue,  8 Sep 2009 04:06:41 +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 BBE708FC12;
	Tue,  8 Sep 2009 04:06:41 +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 n8846fBF035215;
	Tue, 8 Sep 2009 04:06:41 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8846f3b035213;
	Tue, 8 Sep 2009 04:06:41 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <200909080406.n8846f3b035213@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 8 Sep 2009 04:06:41 +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: r196959 - projects/ppc64/sys/powerpc/aim64
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: Tue, 08 Sep 2009 04:06:41 -0000

Author: nwhitehorn
Date: Tue Sep  8 04:06:41 2009
New Revision: 196959
URL: http://svn.freebsd.org/changeset/base/196959

Log:
  Fix an obvious mistake -- the high bits of translations can and should
  be respected now.

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

Modified: projects/ppc64/sys/powerpc/aim64/mmu_oea64.c
==============================================================================
--- projects/ppc64/sys/powerpc/aim64/mmu_oea64.c	Tue Sep  8 04:02:33 2009	(r196958)
+++ projects/ppc64/sys/powerpc/aim64/mmu_oea64.c	Tue Sep  8 04:06:41 2009	(r196959)
@@ -1026,6 +1026,9 @@ moea64_bridge_bootstrap(mmu_t mmup, vm_o
 				    translations[i].om_va + off);
 
 			m.phys_addr = translations[i].om_pa_lo + off;
+		      #ifdef __powerpc64
+			m.phys_addr += translations[i].om_pa_hi << 32;
+		      #endif
 			moea64_enter_locked(&ofw_pmap,
 			    translations[i].om_va + off, &m, VM_PROT_ALL, 1);