summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authoralc <alc@FreeBSD.org>1999-08-11 19:19:04 +0000
committeralc <alc@FreeBSD.org>1999-08-11 19:19:04 +0000
commitdef52516ef69169f33200cdbf4262c4d05a1f94d (patch)
treec45589e8f4b2611e3b48f1516ee50e7f56a23fdc /sys
parent1984324cdc8a409e97c4862c1e83b742dacc8185 (diff)
downloadFreeBSD-src-def52516ef69169f33200cdbf4262c4d05a1f94d.zip
FreeBSD-src-def52516ef69169f33200cdbf4262c4d05a1f94d.tar.gz
_pmap_allocpte:
If the pte page isn't PQ_NONE, panic rather than silently covering up the problem.
Diffstat (limited to 'sys')
-rw-r--r--sys/alpha/alpha/pmap.c9
-rw-r--r--sys/amd64/amd64/pmap.c9
-rw-r--r--sys/i386/i386/pmap.c9
3 files changed, 9 insertions, 18 deletions
diff --git a/sys/alpha/alpha/pmap.c b/sys/alpha/alpha/pmap.c
index 671ae3d..62132f5 100644
--- a/sys/alpha/alpha/pmap.c
+++ b/sys/alpha/alpha/pmap.c
@@ -43,7 +43,7 @@
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
* from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp
* with some ideas from NetBSD's alpha pmap
- * $Id: pmap.c,v 1.28 1999/07/21 18:01:26 alc Exp $
+ * $Id: pmap.c,v 1.29 1999/07/31 23:02:52 alc Exp $
*/
/*
@@ -1385,11 +1385,8 @@ _pmap_allocpte(pmap, ptepindex)
m = vm_page_grab(pmap->pm_pteobj, ptepindex,
VM_ALLOC_ZERO | VM_ALLOC_RETRY);
- if (m->queue != PQ_NONE) {
- int s = splvm();
- vm_page_unqueue(m);
- splx(s);
- }
+ KASSERT(m->queue == PQ_NONE,
+ ("_pmap_allocpte: %p->queue != PQ_NONE", m));
if (m->wire_count == 0)
cnt.v_wire_count++;
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index aa51390..791060a 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -39,7 +39,7 @@
* SUCH DAMAGE.
*
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
- * $Id: pmap.c,v 1.244 1999/07/31 23:02:57 alc Exp $
+ * $Id: pmap.c,v 1.245 1999/08/10 04:10:57 alc Exp $
*/
/*
@@ -1268,11 +1268,8 @@ _pmap_allocpte(pmap, ptepindex)
m = vm_page_grab(pmap->pm_pteobj, ptepindex,
VM_ALLOC_ZERO | VM_ALLOC_RETRY);
- if (m->queue != PQ_NONE) {
- int s = splvm();
- vm_page_unqueue(m);
- splx(s);
- }
+ KASSERT(m->queue == PQ_NONE,
+ ("_pmap_allocpte: %p->queue != PQ_NONE", m));
if (m->wire_count == 0)
cnt.v_wire_count++;
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index aa51390..791060a 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -39,7 +39,7 @@
* SUCH DAMAGE.
*
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
- * $Id: pmap.c,v 1.244 1999/07/31 23:02:57 alc Exp $
+ * $Id: pmap.c,v 1.245 1999/08/10 04:10:57 alc Exp $
*/
/*
@@ -1268,11 +1268,8 @@ _pmap_allocpte(pmap, ptepindex)
m = vm_page_grab(pmap->pm_pteobj, ptepindex,
VM_ALLOC_ZERO | VM_ALLOC_RETRY);
- if (m->queue != PQ_NONE) {
- int s = splvm();
- vm_page_unqueue(m);
- splx(s);
- }
+ KASSERT(m->queue == PQ_NONE,
+ ("_pmap_allocpte: %p->queue != PQ_NONE", m));
if (m->wire_count == 0)
cnt.v_wire_count++;
OpenPOWER on IntegriCloud