diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2001-11-06 13:36:53 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2001-11-06 13:36:53 +0000 |
| commit | dce408d18a14842aa7836a626a151e98665f04e7 (patch) | |
| tree | a3ddb948fd94211a9af9df05d8de6c60a2081605 /sys/uvm/uvm_aobj.c | |
| parent | 789e8c48d1472795faa6a959068b32a1749b315d (diff) | |
More sync to NetBSD.
- Use malloc/free instead of MALLOC/FREE for variable sized allocations.
- Move the memory inheritance code to sys/mman.h and rename from VM_* to MAP_*
- various cleanups and simplifications.
Diffstat (limited to 'sys/uvm/uvm_aobj.c')
| -rw-r--r-- | sys/uvm/uvm_aobj.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/uvm/uvm_aobj.c b/sys/uvm/uvm_aobj.c index 3b0a07dccb5..bae91b851e3 100644 --- a/sys/uvm/uvm_aobj.c +++ b/sys/uvm/uvm_aobj.c @@ -1,5 +1,5 @@ -/* $OpenBSD: uvm_aobj.c,v 1.17 2001/11/06 01:35:04 art Exp $ */ -/* $NetBSD: uvm_aobj.c,v 1.33 2000/06/27 17:29:19 mrg Exp $ */ +/* $OpenBSD: uvm_aobj.c,v 1.18 2001/11/06 13:36:52 art Exp $ */ +/* $NetBSD: uvm_aobj.c,v 1.34 2000/08/02 20:23:23 thorpej Exp $ */ /* * Copyright (c) 1998 Chuck Silvers, Charles D. Cranor and @@ -434,7 +434,7 @@ uao_free(aobj) pool_put(&uao_swhash_elt_pool, elt); } } - FREE(aobj->u_swhash, M_UVMAOBJ); + free(aobj->u_swhash, M_UVMAOBJ); } else { int i; @@ -454,7 +454,7 @@ uao_free(aobj) simple_unlock(&uvm.swap_data_lock); } } - FREE(aobj->u_swslots, M_UVMAOBJ); + free(aobj->u_swslots, M_UVMAOBJ); } /* @@ -527,7 +527,7 @@ uao_create(size, flags) if (aobj->u_swhash == NULL) panic("uao_create: hashinit swhash failed"); } else { - MALLOC(aobj->u_swslots, int *, pages * sizeof(int), + aobj->u_swslots = malloc(pages * sizeof(int), M_UVMAOBJ, mflags); if (aobj->u_swslots == NULL) panic("uao_create: malloc swslots failed"); |