diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2001-12-04 23:22:43 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2001-12-04 23:22:43 +0000 |
| commit | 2d6ebc6b1044ef771b2b25c09c2abffe0c0a0d3d (patch) | |
| tree | f85c4269fcfa3a0ec1575186dfcbcbbb1ebaf8d7 /sys/uvm/uvm_vnode.c | |
| parent | f1bec1965343db9a80a80e7ed55ee2fe5dd36253 (diff) | |
Yet another sync to NetBSD uvm.
Today we add a pmap argument to pmap_update() and allocate map entries for
kernel_map from kmem_map instead of using the static entries. This should
get rid of MAX_KMAPENT panics. Also some uvm_loan problems are fixed.
Diffstat (limited to 'sys/uvm/uvm_vnode.c')
| -rw-r--r-- | sys/uvm/uvm_vnode.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sys/uvm/uvm_vnode.c b/sys/uvm/uvm_vnode.c index 10e75532731..180acc16e66 100644 --- a/sys/uvm/uvm_vnode.c +++ b/sys/uvm/uvm_vnode.c @@ -1,5 +1,5 @@ -/* $OpenBSD: uvm_vnode.c,v 1.28 2001/12/02 23:37:52 art Exp $ */ -/* $NetBSD: uvm_vnode.c,v 1.50 2001/05/26 21:27:21 chs Exp $ */ +/* $OpenBSD: uvm_vnode.c,v 1.29 2001/12/04 23:22:42 art Exp $ */ +/* $NetBSD: uvm_vnode.c,v 1.51 2001/08/17 05:53:02 chs Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -161,12 +161,7 @@ uvn_attach(arg, accessprot) UVMHIST_LOG(maphist,"<- done (VBLK not D_DISK!)", 0,0,0,0); return(NULL); } - -#ifdef DIAGNOSTIC - if (vp->v_type != VREG) { - panic("uvn_attach: vp %p not VREG", vp); - } -#endif + KASSERT(vp->v_type == VREG || vp->v_type == VBLK); /* * set up our idea of the size |