diff options
| author | alc <alc@FreeBSD.org> | 2002-08-10 18:42:13 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 2002-08-10 18:42:13 +0000 |
| commit | b7e2fb065562aa151c25f0e0862b7d7417777804 (patch) | |
| tree | 76a06a599a96831062db27b03be2aba10611a5a1 /sys | |
| parent | 4c29b0e7b73283a028f56ac62c5fbb911b6dc655 (diff) | |
| download | FreeBSD-src-b7e2fb065562aa151c25f0e0862b7d7417777804.zip FreeBSD-src-b7e2fb065562aa151c25f0e0862b7d7417777804.tar.gz | |
o Use the VM_ALLOC_WIRED flag instead of calling vm_page_wire().
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/agp/agp.c | 5 | ||||
| -rw-r--r-- | sys/dev/agp/agp_i810.c | 4 | ||||
| -rw-r--r-- | sys/pci/agp.c | 5 | ||||
| -rw-r--r-- | sys/pci/agp_i810.c | 4 |
4 files changed, 6 insertions, 12 deletions
diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c index aa16c88..b8e04fa 100644 --- a/sys/dev/agp/agp.c +++ b/sys/dev/agp/agp.c @@ -421,13 +421,10 @@ agp_generic_bind_memory(device_t dev, struct agp_memory *mem, * the pages will be allocated and zeroed. */ m = vm_page_grab(mem->am_obj, OFF_TO_IDX(i), - VM_ALLOC_ZERO | VM_ALLOC_RETRY); + VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_RETRY); if ((m->flags & PG_ZERO) == 0) vm_page_zero_fill(m); AGP_DPF("found page pa=%#x\n", VM_PAGE_TO_PHYS(m)); - vm_page_lock_queues(); - vm_page_wire(m); - vm_page_unlock_queues(); /* * Install entries in the GATT, making sure that if diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c index 2916be8..c78cfb1 100644 --- a/sys/dev/agp/agp_i810.c +++ b/sys/dev/agp/agp_i810.c @@ -370,11 +370,11 @@ agp_i810_alloc_memory(device_t dev, int type, vm_size_t size) * get its physical address. */ vm_page_t m; - m = vm_page_grab(mem->am_obj, 0, VM_ALLOC_ZERO|VM_ALLOC_RETRY); + m = vm_page_grab(mem->am_obj, 0, + VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_RETRY); if ((m->flags & PG_ZERO) == 0) vm_page_zero_fill(m); vm_page_lock_queues(); - vm_page_wire(m); mem->am_physical = VM_PAGE_TO_PHYS(m); vm_page_wakeup(m); vm_page_unlock_queues(); diff --git a/sys/pci/agp.c b/sys/pci/agp.c index aa16c88..b8e04fa 100644 --- a/sys/pci/agp.c +++ b/sys/pci/agp.c @@ -421,13 +421,10 @@ agp_generic_bind_memory(device_t dev, struct agp_memory *mem, * the pages will be allocated and zeroed. */ m = vm_page_grab(mem->am_obj, OFF_TO_IDX(i), - VM_ALLOC_ZERO | VM_ALLOC_RETRY); + VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_RETRY); if ((m->flags & PG_ZERO) == 0) vm_page_zero_fill(m); AGP_DPF("found page pa=%#x\n", VM_PAGE_TO_PHYS(m)); - vm_page_lock_queues(); - vm_page_wire(m); - vm_page_unlock_queues(); /* * Install entries in the GATT, making sure that if diff --git a/sys/pci/agp_i810.c b/sys/pci/agp_i810.c index 2916be8..c78cfb1 100644 --- a/sys/pci/agp_i810.c +++ b/sys/pci/agp_i810.c @@ -370,11 +370,11 @@ agp_i810_alloc_memory(device_t dev, int type, vm_size_t size) * get its physical address. */ vm_page_t m; - m = vm_page_grab(mem->am_obj, 0, VM_ALLOC_ZERO|VM_ALLOC_RETRY); + m = vm_page_grab(mem->am_obj, 0, + VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_RETRY); if ((m->flags & PG_ZERO) == 0) vm_page_zero_fill(m); vm_page_lock_queues(); - vm_page_wire(m); mem->am_physical = VM_PAGE_TO_PHYS(m); vm_page_wakeup(m); vm_page_unlock_queues(); |
