Author: cognet
Date: Sun Mar 21 21:03:35 2010
New Revision: 205425
URL: http://svn.freebsd.org/changeset/base/205425
Log:
Make sure we insert and remove the PV entries related to unmanaged kernel
mappings into the kernel pmap, not into the pmap related to the
pmap_enter_pv()/pmap_remove_pv() call.
Modified:
head/sys/arm/arm/pmap.c
Modified: head/sys/arm/arm/pmap.c
==============================================================================
--- head/sys/arm/arm/pmap.c Sun Mar 21 20:45:06 2010 (r205424)
+++ head/sys/arm/arm/pmap.c Sun Mar 21 21:03:35 2010 (r205425)
@@ -1605,10 +1605,11 @@ pmap_enter_pv(struct vm_page *pg, struct
pve->pv_flags = PVF_WRITE | PVF_UNMAN;
pg->md.pv_kva = 0;
+ if (!(km = PMAP_OWNED(pmap_kernel())))
+ PMAP_LOCK(pmap_kernel());
TAILQ_INSERT_HEAD(&pg->md.pv_list, pve, pv_list);
- TAILQ_INSERT_HEAD(&pm->pm_pvlist, pve, pv_plist);
- if ((km = PMAP_OWNED(pmap_kernel())))
- PMAP_UNLOCK(pmap_kernel());
+ TAILQ_INSERT_HEAD(&pve->pv_pmap->pm_pvlist, pve, pv_plist);
+ PMAP_UNLOCK(pmap_kernel());
vm_page_unlock_queues();
if ((pve = pmap_get_pv_entry()) == NULL)
panic("pmap_kenter_internal: no pv entries");
@@ -1712,6 +1713,7 @@ pmap_nuke_pv(struct vm_page *pg, pmap_t
pv = TAILQ_FIRST(&pg->md.pv_list);
if (pv != NULL && (pv->pv_flags & PVF_UNMAN) &&
TAILQ_NEXT(pv, pv_list) == NULL) {
+ pm = kernel_pmap;
pg->md.pv_kva = pv->pv_va;
/* a recursive pmap_nuke_pv */
TAILQ_REMOVE(&pg->md.pv_list, pv, pv_list);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
