From owner-svn-src-head@FreeBSD.ORG  Wed Mar 11 03:19:20 2009
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2760F106564A;
	Wed, 11 Mar 2009 03:19:20 +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 152E28FC14;
	Wed, 11 Mar 2009 03:19:20 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2B3JJs1082648;
	Wed, 11 Mar 2009 03:19:19 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2B3JJbO082647;
	Wed, 11 Mar 2009 03:19:19 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <200903110319.n2B3JJbO082647@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Wed, 11 Mar 2009 03:19:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r189675 - head/sys/powerpc/aim
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Wed, 11 Mar 2009 03:19:20 -0000

Author: nwhitehorn
Date: Wed Mar 11 03:19:19 2009
New Revision: 189675
URL: http://svn.freebsd.org/changeset/base/189675

Log:
  Change the PVO zone for fictitious pages to the unmanaged PVO zone, to match
  the unmanaged flag set in the PVO attributes. Without doing this,
  pmap_remove() could try to remove fictitious pages (like those created
  by mmap of physical memory) from the wrong UMA zone, causing a panic.
  
  Reported by:	Justin Hibbits
  MFC after:	1 week

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

Modified: head/sys/powerpc/aim/mmu_oea.c
==============================================================================
--- head/sys/powerpc/aim/mmu_oea.c	Wed Mar 11 03:00:40 2009	(r189674)
+++ head/sys/powerpc/aim/mmu_oea.c	Wed Mar 11 03:19:19 2009	(r189675)
@@ -1081,8 +1081,11 @@ moea_enter_locked(pmap_t pmap, vm_offset
 	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
 
 	/* XXX change the pvo head for fake pages */
-	if ((m->flags & PG_FICTITIOUS) == PG_FICTITIOUS)
+	if ((m->flags & PG_FICTITIOUS) == PG_FICTITIOUS) {
+		pvo_flags &= ~PVO_MANAGED;
 		pvo_head = &moea_pvo_kunmanaged;
+		zone = moea_upvo_zone;
+	}
 
 	/*
 	 * If this is a managed page, and it's the first reference to the page,