diff options
| author | attilio <attilio@FreeBSD.org> | 2013-02-20 10:38:34 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2013-02-20 10:38:34 +0000 |
| commit | 658534ed5a02db4fef5b0630008502474d6c26d6 (patch) | |
| tree | 567755b13eb4e24198cc8098e62ff4a975f8486c /sys/dev/agp | |
| parent | 5dce0c1384f698b3a27a82e72e3cbcf49b325404 (diff) | |
| download | FreeBSD-src-658534ed5a02db4fef5b0630008502474d6c26d6.zip FreeBSD-src-658534ed5a02db4fef5b0630008502474d6c26d6.tar.gz | |
Switch vm_object lock to be a rwlock.
* VM_OBJECT_LOCK and VM_OBJECT_UNLOCK are mapped to write operations
* VM_OBJECT_SLEEP() is introduced as a general purpose primitve to
get a sleep operation using a VM_OBJECT_LOCK() as protection
* The approach must bear with vm_pager.h namespace pollution so many
files require including directly rwlock.h
Diffstat (limited to 'sys/dev/agp')
| -rw-r--r-- | sys/dev/agp/agp.c | 3 | ||||
| -rw-r--r-- | sys/dev/agp/agp_i810.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c index 79b2d54..5284248 100644 --- a/sys/dev/agp/agp.c +++ b/sys/dev/agp/agp.c @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include <sys/lock.h> #include <sys/mutex.h> #include <sys/proc.h> +#include <sys/rwlock.h> #include <dev/agp/agppriv.h> #include <dev/agp/agpvar.h> @@ -622,7 +623,7 @@ agp_generic_bind_memory(device_t dev, struct agp_memory *mem, return 0; bad: mtx_unlock(&sc->as_lock); - VM_OBJECT_LOCK_ASSERT(mem->am_obj, MA_OWNED); + VM_OBJECT_LOCK_ASSERT(mem->am_obj, RA_WLOCKED); for (k = 0; k < mem->am_size; k += PAGE_SIZE) { m = vm_page_lookup(mem->am_obj, OFF_TO_IDX(k)); if (k >= i) diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c index 9ec3992..30c0dca 100644 --- a/sys/dev/agp/agp_i810.c +++ b/sys/dev/agp/agp_i810.c @@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$"); #include <sys/lock.h> #include <sys/mutex.h> #include <sys/proc.h> +#include <sys/rwlock.h> #include <dev/agp/agppriv.h> #include <dev/agp/agpreg.h> |
