summaryrefslogtreecommitdiffstats
path: root/sys/dev/agp
diff options
context:
space:
mode:
authoralc <alc@FreeBSD.org>2010-05-05 03:45:46 +0000
committeralc <alc@FreeBSD.org>2010-05-05 03:45:46 +0000
commitea7b6345be41650b664c9b86b93526b79177c75f (patch)
tree20d3f2d2748e5c26aa0ee168b8337650bc8905cd /sys/dev/agp
parent30b63b91fa4784d0199bd0f95c61f2b6acaf8603 (diff)
downloadFreeBSD-src-ea7b6345be41650b664c9b86b93526b79177c75f.zip
FreeBSD-src-ea7b6345be41650b664c9b86b93526b79177c75f.tar.gz
Push down the acquisition of the page queues lock into vm_page_unwire().
Update the comment describing which lock should be held on entry to vm_page_wire(). Reviewed by: kib
Diffstat (limited to 'sys/dev/agp')
-rw-r--r--sys/dev/agp/agp.c4
-rw-r--r--sys/dev/agp/agp_i810.c2
2 files changed, 0 insertions, 6 deletions
diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c
index 89b68b0..577a7e9 100644
--- a/sys/dev/agp/agp.c
+++ b/sys/dev/agp/agp.c
@@ -624,9 +624,7 @@ bad:
if (k >= i)
vm_page_wakeup(m);
vm_page_lock(m);
- vm_page_lock_queues();
vm_page_unwire(m, 0);
- vm_page_unlock_queues();
vm_page_unlock(m);
}
VM_OBJECT_UNLOCK(mem->am_obj);
@@ -660,9 +658,7 @@ agp_generic_unbind_memory(device_t dev, struct agp_memory *mem)
for (i = 0; i < mem->am_size; i += PAGE_SIZE) {
m = vm_page_lookup(mem->am_obj, atop(i));
vm_page_lock(m);
- vm_page_lock_queues();
vm_page_unwire(m, 0);
- vm_page_unlock_queues();
vm_page_unlock(m);
}
VM_OBJECT_UNLOCK(mem->am_obj);
diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c
index 44eb50d..ff3ad1c 100644
--- a/sys/dev/agp/agp_i810.c
+++ b/sys/dev/agp/agp_i810.c
@@ -1011,9 +1011,7 @@ agp_i810_free_memory(device_t dev, struct agp_memory *mem)
VM_OBJECT_LOCK(mem->am_obj);
m = vm_page_lookup(mem->am_obj, 0);
vm_page_lock(m);
- vm_page_lock_queues();
vm_page_unwire(m, 0);
- vm_page_unlock_queues();
vm_page_unlock(m);
VM_OBJECT_UNLOCK(mem->am_obj);
} else {
OpenPOWER on IntegriCloud