diff options
| author | Charles Longeau <chl@cvs.openbsd.org> | 2007-10-29 17:08:09 +0000 |
|---|---|---|
| committer | Charles Longeau <chl@cvs.openbsd.org> | 2007-10-29 17:08:09 +0000 |
| commit | b57027c2da29afd8871495930d2dd49758b7af4b (patch) | |
| tree | 067eb92d07dcbcdfa2162e8b1f40df372299fa15 | |
| parent | 05070ba5664cd1f90f8c37b6be09b1b58199648d (diff) | |
MALLOC/FREE -> malloc/free
ok krw@
| -rw-r--r-- | sys/uvm/uvm_device.c | 9 | ||||
| -rw-r--r-- | sys/uvm/uvm_map_i.h | 6 | ||||
| -rw-r--r-- | sys/uvm/uvm_swap.c | 4 |
3 files changed, 9 insertions, 10 deletions
diff --git a/sys/uvm/uvm_device.c b/sys/uvm/uvm_device.c index ba9258fd600..88404d23d8c 100644 --- a/sys/uvm/uvm_device.c +++ b/sys/uvm/uvm_device.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_device.c,v 1.27 2006/07/31 11:51:29 mickey Exp $ */ +/* $OpenBSD: uvm_device.c,v 1.28 2007/10/29 17:08:08 chl Exp $ */ /* $NetBSD: uvm_device.c,v 1.30 2000/11/25 06:27:59 chs Exp $ */ /* @@ -216,8 +216,7 @@ udv_attach(arg, accessprot, off, size) simple_unlock(&udv_lock); /* NOTE: we could sleep in the following malloc() */ - MALLOC(udv, struct uvm_device *, sizeof(*udv), M_TEMP, - M_WAITOK); + udv = malloc(sizeof(*udv), M_TEMP, M_WAITOK); simple_lock(&udv_lock); /* @@ -237,7 +236,7 @@ udv_attach(arg, accessprot, off, size) if (lcv) { simple_unlock(&udv_lock); - FREE(udv, M_TEMP); + free(udv, M_TEMP); continue; } @@ -333,7 +332,7 @@ again: wakeup(udv); simple_unlock(&udv_lock); simple_unlock(&uobj->vmobjlock); - FREE(udv, M_TEMP); + free(udv, M_TEMP); UVMHIST_LOG(maphist," <- done, freed uobj=%p", uobj,0,0,0); } diff --git a/sys/uvm/uvm_map_i.h b/sys/uvm/uvm_map_i.h index 70dd13e2a2d..c4d1f2c4363 100644 --- a/sys/uvm/uvm_map_i.h +++ b/sys/uvm/uvm_map_i.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_map_i.h,v 1.21 2007/04/11 12:10:42 art Exp $ */ +/* $OpenBSD: uvm_map_i.h,v 1.22 2007/10/29 17:08:08 chl Exp $ */ /* $NetBSD: uvm_map_i.h,v 1.18 2000/11/27 08:40:04 chs Exp $ */ /* @@ -92,7 +92,7 @@ uvm_map_create(pmap, min, max, flags) { vm_map_t result; - MALLOC(result, vm_map_t, sizeof(struct vm_map), M_VMMAP, M_WAITOK); + result = malloc(sizeof(struct vm_map), M_VMMAP, M_WAITOK); uvm_map_setup(result, min, max, flags); result->pmap = pmap; return(result); @@ -206,7 +206,7 @@ uvm_map_deallocate(map) uvm_unmap(map, map->min_offset, map->max_offset); pmap_destroy(map->pmap); - FREE(map, M_VMMAP); + free(map, M_VMMAP); } #endif /* defined(UVM_MAP_INLINE) || defined(UVM_MAP) */ diff --git a/sys/uvm/uvm_swap.c b/sys/uvm/uvm_swap.c index eea4bf6717c..41c843d6dfc 100644 --- a/sys/uvm/uvm_swap.c +++ b/sys/uvm/uvm_swap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_swap.c,v 1.73 2007/09/07 15:00:20 art Exp $ */ +/* $OpenBSD: uvm_swap.c,v 1.74 2007/10/29 17:08:08 chl Exp $ */ /* $NetBSD: uvm_swap.c,v 1.40 2000/11/17 11:39:39 mrg Exp $ */ /* @@ -488,7 +488,7 @@ swaplist_insert(sdp, newspp, priority) LIST_INSERT_HEAD(&swap_priority, spp, spi_swappri); } else { /* we don't need a new priority structure, free it */ - FREE(newspp, M_VMSWAP); + free(newspp, M_VMSWAP); } /* |