svn commit: r190302 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb powerpc/powerpc

[Nathan Whitehorn]

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,