From owner-svn-src-projects@FreeBSD.ORG  Fri Mar 19 16:25:05 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 97BD71065679;
	Fri, 19 Mar 2010 16:25:05 +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 878E08FC12;
	Fri, 19 Mar 2010 16:25:05 +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 o2JGP5Ah002555;
	Fri, 19 Mar 2010 16:25:05 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2JGP5JX002553;
	Fri, 19 Mar 2010 16:25:05 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201003191625.o2JGP5JX002553@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Fri, 19 Mar 2010 16:25:05 +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: r205338 - 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, 19 Mar 2010 16:25:05 -0000

Author: nwhitehorn
Date: Fri Mar 19 16:25:05 2010
New Revision: 205338
URL: http://svn.freebsd.org/changeset/base/205338

Log:
  Fix build on 32-bit PowerPC.
  
  Submitted by:	Andreas Tobler

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 19 16:15:11 2010	(r205337)
+++ projects/ppc64/sys/powerpc/aim/mmu_oea64.c	Fri Mar 19 16:25:05 2010	(r205338)
@@ -859,7 +859,6 @@ moea64_setup_direct_map(mmu_t mmup, vm_o
 
 	DISABLE_TRANS(msr);
 	if (hw_direct_map) {
-		#ifdef __powerpc64__
 		PMAP_LOCK(kernel_pmap);
 		for (i = 0; i < pregions_sz; i++) {
 		  for (pa = pregions[i].mr_start; pa < pregions[i].mr_start +
@@ -885,7 +884,6 @@ moea64_setup_direct_map(mmu_t mmup, vm_o
 		  }
 		}
 		PMAP_UNLOCK(kernel_pmap);
-		#endif
 	} else {
 		size = moea64_pteg_count * sizeof(struct lpteg);
 		off = (vm_offset_t)(moea64_pteg_table);
@@ -1869,7 +1867,8 @@ moea64_kextract(mmu_t mmu, vm_offset_t v
 
 	PMAP_LOCK(kernel_pmap);
 	pvo = moea64_pvo_find_va(kernel_pmap, va, NULL);
-	KASSERT(pvo != NULL, ("moea64_kextract: no addr found for %#lx", va));
+	KASSERT(pvo != NULL, ("moea64_kextract: no addr found for %#" PRIxPTR,
+	    va));
 	pa = (pvo->pvo_pte.lpte.pte_lo & LPTE_RPGN) + (va - PVO_VADDR(pvo));
 	PMAP_UNLOCK(kernel_pmap);
 	return (pa);
@@ -2016,6 +2015,7 @@ moea64_pinit(mmu_t mmu, pmap_t pmap)
 #else
 void
 moea64_pinit(mmu_t mmu, pmap_t pmap)
+{
 	int	i;
 	register_t hash;