diff options
| author | alc <alc@FreeBSD.org> | 2003-04-15 01:16:05 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 2003-04-15 01:16:05 +0000 |
| commit | 1a58aa967827e55b7062b5cc45de8bbef3f21d65 (patch) | |
| tree | 1349df26098ba58832021bbd8f4e0b1fe1e9429b | |
| parent | 301ae6309656cb89a587a672d3b99cfbe675b5a3 (diff) | |
| download | FreeBSD-src-1a58aa967827e55b7062b5cc45de8bbef3f21d65.zip FreeBSD-src-1a58aa967827e55b7062b5cc45de8bbef3f21d65.tar.gz | |
Update locking on the kmem_object to use the new macros.
| -rw-r--r-- | sys/vm/vm_kern.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index e7bf945..b0f7e61 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -362,7 +362,7 @@ kmem_malloc(map, size, flags) if (flags & M_ZERO) pflags |= VM_ALLOC_ZERO; - vm_object_lock(kmem_object); + VM_OBJECT_LOCK(kmem_object); for (i = 0; i < size; i += PAGE_SIZE) { retry: m = vm_page_alloc(kmem_object, OFF_TO_IDX(offset + i), pflags); @@ -374,11 +374,11 @@ retry: */ if (m == NULL) { if ((flags & M_NOWAIT) == 0) { - vm_object_unlock(kmem_object); + VM_OBJECT_UNLOCK(kmem_object); vm_map_unlock(map); VM_WAIT; vm_map_lock(map); - vm_object_lock(kmem_object); + VM_OBJECT_LOCK(kmem_object); goto retry; } /* @@ -396,7 +396,7 @@ retry: vm_page_free(m); vm_page_unlock_queues(); } - vm_object_unlock(kmem_object); + VM_OBJECT_UNLOCK(kmem_object); vm_map_delete(map, addr, addr + size); vm_map_unlock(map); return (0); @@ -408,7 +408,7 @@ retry: m->valid = VM_PAGE_BITS_ALL; vm_page_unlock_queues(); } - vm_object_unlock(kmem_object); + VM_OBJECT_UNLOCK(kmem_object); /* * Mark map entry as non-pageable. Assert: vm_map_insert() will never @@ -430,9 +430,9 @@ retry: * splimp...) */ for (i = 0; i < size; i += PAGE_SIZE) { - vm_object_lock(kmem_object); + VM_OBJECT_LOCK(kmem_object); m = vm_page_lookup(kmem_object, OFF_TO_IDX(offset + i)); - vm_object_unlock(kmem_object); + VM_OBJECT_UNLOCK(kmem_object); /* * Because this is kernel_pmap, this call will not block. */ |
