diff options
| author |   martin <martin@openbsd.org> | 2007-09-01 15:14:44 +0000 |
|---|---|---|
| committer | martin <martin@openbsd.org> | 2007-09-01 15:14:44 +0000 |
| commit | 6811be10fa8baa4a0027fcc04ed31610c7598ec7 (patch) | |
| tree | 1da94f270937cbbc4ffb6e1482b17d8cf8e999cc /sys/kern/kern_malloc.c | |
| parent | Fix space and underline handling in rasops24_putchar(), spotted by Leon Zadorin. (diff) | |
| download | wireguard-openbsd-6811be10fa8baa4a0027fcc04ed31610c7598ec7.tar.xz wireguard-openbsd-6811be10fa8baa4a0027fcc04ed31610c7598ec7.zip | |
replace the machine dependant bytes-to-clicks macro by the MI ptoa()
version for i386
more architectures and ctob() replacement is being worked on
prodded by and ok miod
Diffstat (limited to 'sys/kern/kern_malloc.c')
| -rw-r--r-- | sys/kern/kern_malloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 59ea3233a1a..9cb2f7ce2ca 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_malloc.c,v 1.70 2007/05/29 00:17:32 thib Exp $ */ +/* $OpenBSD: kern_malloc.c,v 1.71 2007/09/01 15:14:44 martin Exp $ */ /* $NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $ */ /* @@ -200,7 +200,7 @@ malloc(unsigned long size, int type, int flags) allocsize = 1 << indx; npg = btoc(allocsize); va = (caddr_t) uvm_km_kmemalloc(kmem_map, NULL, - (vsize_t)ctob(npg), + (vsize_t)ptoa(npg), ((flags & M_NOWAIT) ? UVM_KMF_NOWAIT : 0) | ((flags & M_CANFAIL) ? UVM_KMF_CANFAIL : 0)); if (va == NULL) { @@ -381,7 +381,7 @@ free(void *addr, int type) addr, size, memname[type], alloc); #endif /* DIAGNOSTIC */ if (size > MAXALLOCSAVE) { - uvm_km_free(kmem_map, (vaddr_t)addr, ctob(kup->ku_pagecnt)); + uvm_km_free(kmem_map, (vaddr_t)addr, ptoa(kup->ku_pagecnt)); #ifdef KMEMSTATS size = kup->ku_pagecnt << PGSHIFT; ksp->ks_memuse -= size; |