aboutsummaryrefslogtreecommitdiff
path: root/sys/vm
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2001-05-23 22:27:52 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2001-05-23 22:27:52 +0000
commit6d556da5c23a2526564328612b2dd9b3568bf1b8 (patch)
treeea0eb3debc72c76e327fcae8c517fad52bc31d8a /sys/vm
parentce70e0a9647cc995c91b5af2f34e4543f76128ce (diff)
Notes
Diffstat (limited to 'sys/vm')
-rw-r--r--sys/vm/device_pager.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index 86f88a3cdf6c..b7c35af6cecc 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -106,6 +106,7 @@ dev_pager_alloc(void *handle, vm_ooffset_t size, vm_prot_t prot, vm_ooffset_t fo
unsigned int npages;
vm_offset_t off;
+ mtx_assert(&Giant, MA_OWNED);
/*
* Make sure this device can be mapped.
*/
@@ -198,10 +199,11 @@ dev_pager_getpages(object, m, count, reqpage)
vm_offset_t paddr;
vm_page_t page;
dev_t dev;
- int i, s;
+ int i;
d_mmap_t *mapfunc;
int prot;
+ mtx_assert(&Giant, MA_OWNED);
dev = object->handle;
offset = m[reqpage]->pindex;
prot = PROT_READ; /* XXX should pass in? */
@@ -221,9 +223,7 @@ dev_pager_getpages(object, m, count, reqpage)
for (i = 0; i < count; i++) {
vm_page_free(m[i]);
}
- s = splhigh();
vm_page_insert(page, object, offset);
- splx(s);
return (VM_PAGER_OK);
}