From owner-svn-src-user@FreeBSD.ORG  Sun Aug 22 19:06:21 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 46F14106566B;
	Sun, 22 Aug 2010 19:06:21 +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 36FD78FC24;
	Sun, 22 Aug 2010 19:06:21 +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 o7MJ6L3C012136;
	Sun, 22 Aug 2010 19:06:21 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7MJ6LZa012134;
	Sun, 22 Aug 2010 19:06:21 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201008221906.o7MJ6LZa012134@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 22 Aug 2010 19:06:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211635 - user/nwhitehorn/ps3/powerpc/aim
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Aug 2010 19:06:21 -0000

Author: nwhitehorn
Date: Sun Aug 22 19:06:20 2010
New Revision: 211635
URL: http://svn.freebsd.org/changeset/base/211635

Log:
  Fix one instance where a non-hypervisor page table routine was being
  called unconditionally.

Modified:
  user/nwhitehorn/ps3/powerpc/aim/mmu_oea64.c

Modified: user/nwhitehorn/ps3/powerpc/aim/mmu_oea64.c
==============================================================================
--- user/nwhitehorn/ps3/powerpc/aim/mmu_oea64.c	Sun Aug 22 16:53:28 2010	(r211634)
+++ user/nwhitehorn/ps3/powerpc/aim/mmu_oea64.c	Sun Aug 22 19:06:20 2010	(r211635)
@@ -2881,7 +2881,10 @@ moea64_query_bit(vm_page_t m, u_int64_t 
 		 * ptebit is set, cache it and return success.
 		 */
 		LOCK_TABLE();
-		pt = moea64_pvo_to_pte_native(pvo);
+		if (moea64_pvo_to_pte_hook)
+			pt = moea64_pvo_to_pte_hook(pvo);
+		else
+			pt = moea64_pvo_to_pte_native(pvo);
 		if (pt != NULL) {
 			if (moea64_pte_synch_hook != NULL)
 				moea64_pte_synch_hook(pt, &pvo->pvo_pte.lpte);