From owner-svn-src-projects@FreeBSD.ORG  Sat Jun 19 20:34:37 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 5ECBB106566C;
	Sat, 19 Jun 2010 20:34:37 +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 4E4DE8FC1B;
	Sat, 19 Jun 2010 20:34:37 +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 o5JKYbat088129;
	Sat, 19 Jun 2010 20:34:37 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5JKYbBN088127;
	Sat, 19 Jun 2010 20:34:37 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201006192034.o5JKYbBN088127@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 19 Jun 2010 20:34:37 +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: r209354 - 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, 19 Jun 2010 20:34:37 -0000

Author: nwhitehorn
Date: Sat Jun 19 20:34:37 2010
New Revision: 209354
URL: http://svn.freebsd.org/changeset/base/209354

Log:
  Change a silent failure to a loud failure.

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	Sat Jun 19 20:11:06 2010	(r209353)
+++ projects/ppc64/sys/powerpc/aim/mmu_oea64.c	Sat Jun 19 20:34:37 2010	(r209354)
@@ -2814,8 +2814,8 @@ moea64_pte_insert(u_int ptegidx, struct 
 
 	LIST_FOREACH(pvo, &moea64_pvo_table[pteg_bktidx], pvo_olink) {
 		if (pvo->pvo_pte.lpte.pte_hi == pt->pte_hi) {
-			if (!(pvo->pvo_pte.lpte.pte_hi & LPTE_VALID))
-				continue;
+			KASSERT(pvo->pvo_pte.lpte.pte_hi & LPTE_VALID, 
+			    ("Invalid PVO for valid PTE!\n"));
 			moea64_pte_unset(pt, &pvo->pvo_pte.lpte, pvo->pvo_vpn);
 			PVO_PTEGIDX_CLR(pvo);
 			moea64_pte_overflow++;
@@ -2827,9 +2827,9 @@ moea64_pte_insert(u_int ptegidx, struct 
 		/* It could have landed in the secondary PTEG */
 		pteg_bktidx ^= moea64_pteg_mask;
 		LIST_FOREACH(pvo, &moea64_pvo_table[pteg_bktidx], pvo_olink) {
-			if (!(pvo->pvo_pte.lpte.pte_hi & LPTE_VALID))
-				continue;
 			if (pvo->pvo_pte.lpte.pte_hi == pt->pte_hi) {
+				KASSERT(pvo->pvo_pte.lpte.pte_hi & LPTE_VALID, 
+				    ("Invalid PVO for valid PTE!\n"));
 				moea64_pte_unset(pt, &pvo->pvo_pte.lpte,
 				    pvo->pvo_vpn);
 				PVO_PTEGIDX_CLR(pvo);