From owner-svn-src-head@FreeBSD.ORG  Tue Aug  6 02:58:17 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 2DC33FD2;
 Tue,  6 Aug 2013 02:58:17 +0000 (UTC)
 (envelope-from jhibbits@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1B7D023A5;
 Tue,  6 Aug 2013 02:58:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r762wG7N015148;
 Tue, 6 Aug 2013 02:58:16 GMT (envelope-from jhibbits@svn.freebsd.org)
Received: (from jhibbits@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r762wGJG015147;
 Tue, 6 Aug 2013 02:58:16 GMT (envelope-from jhibbits@svn.freebsd.org)
Message-Id: <201308060258.r762wGJG015147@svn.freebsd.org>
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Tue, 6 Aug 2013 02:58:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r253978 - head/sys/powerpc/aim
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Aug 2013 02:58:17 -0000

Author: jhibbits
Date: Tue Aug  6 02:58:16 2013
New Revision: 253978
URL: http://svnweb.freebsd.org/changeset/base/253978

Log:
  Remove an unnecessary panic.  The PVO's PTE entry and the PTEG's PTE entry may
  not match, if the PVO's PTE is invalid.

Modified:
  head/sys/powerpc/aim/mmu_oea.c

Modified: head/sys/powerpc/aim/mmu_oea.c
==============================================================================
--- head/sys/powerpc/aim/mmu_oea.c	Tue Aug  6 02:14:30 2013	(r253977)
+++ head/sys/powerpc/aim/mmu_oea.c	Tue Aug  6 02:58:16 2013	(r253978)
@@ -2161,9 +2161,6 @@ moea_pvo_to_pte(const struct pvo_entry *
 		    "pvo but no valid pte", pvo);
 	}
 
-	if (pvo->pvo_pte.pte.pte_hi != pt->pte_hi) {
-		panic("moea_pvo_to_pte: pvo does not match pte: pvo hi: %8x, pte hi: %8x", pvo->pvo_pte.pte.pte_hi, pt->pte_hi);
-	}
 	if ((pt->pte_hi ^ (pvo->pvo_pte.pte.pte_hi & ~PTE_VALID)) == PTE_VALID) {
 		if ((pvo->pvo_pte.pte.pte_hi & PTE_VALID) == 0) {
 			panic("moea_pvo_to_pte: pvo %p has valid pte in "