From aec86de47b916d7e034c05b9e30fb2b8a2c2ffd6 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Sun, 18 Jul 2004 21:19:10 +0000 Subject: [PATCH] Utilize pmap_pte_quick() rather than pmap_pte() in pmap_protect(). The reason being that pmap_pte_quick() requires the page queues lock, which is already held, rather than Giant. --- sys/i386/i386/pmap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index bbb4be39e64..5a4af6a93f2 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -1805,6 +1805,7 @@ pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot) anychanged = 0; vm_page_lock_queues(); + sched_pin(); PMAP_LOCK(pmap); for (; sva < eva; sva = pdnxt) { unsigned pdirindex; @@ -1839,7 +1840,7 @@ pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot) pt_entry_t *pte; vm_page_t m; - if ((pte = pmap_pte(pmap, sva)) == NULL) + if ((pte = pmap_pte_quick(pmap, sva)) == NULL) continue; pbits = *pte; if (pbits & PG_MANAGED) { @@ -1868,6 +1869,7 @@ pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot) } if (anychanged) pmap_invalidate_all(pmap); + sched_unpin(); vm_page_unlock_queues(); PMAP_UNLOCK(pmap); }