From owner-svn-src-all@FreeBSD.ORG  Mon Mar 23 00:15:38 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6259B1065670;
	Mon, 23 Mar 2009 00:15:38 +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 4DCB58FC1E;
	Mon, 23 Mar 2009 00:15:38 +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 n2N0Fcv3088569;
	Mon, 23 Mar 2009 00:15:38 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2N0Fcd6088568;
	Mon, 23 Mar 2009 00:15:38 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <200903230015.n2N0Fcd6088568@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 23 Mar 2009 00:15:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190302 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb powerpc/powerpc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Mar 2009 00:15:39 -0000

Author: nwhitehorn
Date: Mon Mar 23 00:15:38 2009
New Revision: 190302
URL: http://svn.freebsd.org/changeset/base/190302

Log:
  MFC r189675:
  
  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

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/powerpc/powerpc/mmu_oea.c

Modified: stable/7/sys/powerpc/powerpc/mmu_oea.c
==============================================================================
--- stable/7/sys/powerpc/powerpc/mmu_oea.c	Mon Mar 23 00:00:50 2009	(r190301)
+++ stable/7/sys/powerpc/powerpc/mmu_oea.c	Mon Mar 23 00:15:38 2009	(r190302)
@@ -1102,8 +1102,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,