diff options
| author |   art <art@openbsd.org> | 1999-07-15 14:07:41 +0000 |
|---|---|---|
| committer | art <art@openbsd.org> | 1999-07-15 14:07:41 +0000 |
| commit | d01f7d6a6e21499b5abdde1c62ada7685e973c12 (patch) | |
| tree | 62d5a67026eb4be33f62e89af213307068981a61 /sys/kern/kern_malloc.c | |
| parent | Back out the mis-commit of my development ISDN modifications. (diff) | |
| download | wireguard-openbsd-d01f7d6a6e21499b5abdde1c62ada7685e973c12.tar.xz wireguard-openbsd-d01f7d6a6e21499b5abdde1c62ada7685e973c12.zip | |
vm_offset_t -> {v,p}addr_t ; vm_size_t -> {v,p}size_t
Diffstat (limited to 'sys/kern/kern_malloc.c')
| -rw-r--r-- | sys/kern/kern_malloc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 64f3f662821..3b94a4897eb 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_malloc.c,v 1.15 1999/06/23 07:43:30 art Exp $ */ +/* $OpenBSD: kern_malloc.c,v 1.16 1999/07/15 14:07:41 art Exp $ */ /* $NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $ */ /* @@ -154,7 +154,7 @@ malloc(size, type, flags) (vsize_t)ctob(npg), (flags & M_NOWAIT) ? UVM_KMF_NOWAIT : 0); #else - va = (caddr_t) kmem_malloc(kmem_map, (vm_size_t)ctob(npg), + va = (caddr_t) kmem_malloc(kmem_map, (vsize_t)ctob(npg), !(flags & M_NOWAIT)); #endif if (va == NULL) { @@ -340,7 +340,7 @@ free(addr, type) #if defined(UVM) uvm_km_free(kmem_map, (vaddr_t)addr, ctob(kup->ku_pagecnt)); #else - kmem_free(kmem_map, (vm_offset_t)addr, ctob(kup->ku_pagecnt)); + kmem_free(kmem_map, (vaddr_t)addr, ctob(kup->ku_pagecnt)); #endif #ifdef KMEMSTATS size = kup->ku_pagecnt << PGSHIFT; @@ -442,9 +442,9 @@ kmeminit() FALSE, FALSE, &kmem_map_store); #else kmemusage = (struct kmemusage *) kmem_alloc(kernel_map, - (vm_size_t)(npg * sizeof(struct kmemusage))); - kmem_map = kmem_suballoc(kernel_map, (vm_offset_t *)&kmembase, - (vm_offset_t *)&kmemlimit, (vm_size_t)(npg * NBPG), FALSE); + (vsize_t)(npg * sizeof(struct kmemusage))); + kmem_map = kmem_suballoc(kernel_map, (vaddr_t *)&kmembase, + (vaddr_t *)&kmemlimit, (vsize_t)(npg * NBPG), FALSE); #endif #ifdef KMEMSTATS for (indx = 0; indx < MINBUCKET + 16; indx++) { |