diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2001-11-07 02:55:52 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2001-11-07 02:55:52 +0000 |
| commit | cc211db56384036a7e588d635b51f11a921dd54e (patch) | |
| tree | 901408843f90b295b4287da701ff27afbb5c876c /sys/uvm/uvm_pager_i.h | |
| parent | 253f31ab10d5b90c1d64de9c7dec0385fa0c9f7c (diff) | |
Another sync of uvm to NetBSD. Just minor fiddling, no major changes.
Diffstat (limited to 'sys/uvm/uvm_pager_i.h')
| -rw-r--r-- | sys/uvm/uvm_pager_i.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sys/uvm/uvm_pager_i.h b/sys/uvm/uvm_pager_i.h index c7776c42bdd..397c0e544cd 100644 --- a/sys/uvm/uvm_pager_i.h +++ b/sys/uvm/uvm_pager_i.h @@ -1,5 +1,5 @@ -/* $OpenBSD: uvm_pager_i.h,v 1.7 2001/08/11 10:57:22 art Exp $ */ -/* $NetBSD: uvm_pager_i.h,v 1.9 2000/05/08 23:13:42 thorpej Exp $ */ +/* $OpenBSD: uvm_pager_i.h,v 1.8 2001/11/07 02:55:50 art Exp $ */ +/* $NetBSD: uvm_pager_i.h,v 1.10 2000/11/25 06:28:00 chs Exp $ */ /* * @@ -57,11 +57,15 @@ PAGER_INLINE struct vm_page * uvm_pageratop(kva) vaddr_t kva; { + struct vm_page *pg; paddr_t pa; + boolean_t rv; - if (__predict_false(pmap_extract(pmap_kernel(), kva, &pa) == FALSE)) - panic("uvm_pageratop"); - return (PHYS_TO_VM_PAGE(pa)); + rv = pmap_extract(pmap_kernel(), kva, &pa); + KASSERT(rv); + pg = PHYS_TO_VM_PAGE(pa); + KASSERT(pg != NULL); + return (pg); } #endif /* defined(UVM_PAGER_INLINE) || defined(UVM_PAGER) */ |