diff options
Diffstat (limited to 'sys/kern/sysv_shm.c')
| -rw-r--r-- | sys/kern/sysv_shm.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index 538f530efaf..9d1c0ccf2ef 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysv_shm.c,v 1.48 2007/09/07 15:00:20 art Exp $ */ +/* $OpenBSD: sysv_shm.c,v 1.49 2007/09/15 10:10:37 martin Exp $ */ /* $NetBSD: sysv_shm.c,v 1.50 1998/10/21 22:24:29 tron Exp $ */ /* @@ -155,7 +155,7 @@ shm_deallocate_segment(struct shmid_ds *shmseg) size = round_page(shmseg->shm_segsz); uao_detach(shm_handle->shm_object); pool_put(&shm_pool, shmseg); - shm_committed -= btoc(size); + shm_committed -= atop(size); shm_nused--; } @@ -400,10 +400,10 @@ shmget_allocate_segment(struct proc *p, if (shm_nused >= shminfo.shmmni) /* any shmids left? */ return (ENOSPC); size = round_page(SCARG(uap, size)); - if (shm_committed + btoc(size) > shminfo.shmall) + if (shm_committed + atop(size) > shminfo.shmall) return (ENOMEM); shm_nused++; - shm_committed += btoc(size); + shm_committed += atop(size); /* * If a key has been specified and we had to wait for memory @@ -417,7 +417,7 @@ shmget_allocate_segment(struct proc *p, if (shm_find_segment_by_key(key) != -1) { pool_put(&shm_pool, shmseg); shm_nused--; - shm_committed -= btoc(size); + shm_committed -= atop(size); return (EAGAIN); } } @@ -576,8 +576,8 @@ sysctl_sysvshm(int *name, u_int namelen, void *oldp, size_t *oldlenp, return (error); /* If new shmmax > shmall, crank shmall */ - if (btoc(round_page(shminfo.shmmax)) > shminfo.shmall) - shminfo.shmall = btoc(round_page(shminfo.shmmax)); + if (atop(round_page(shminfo.shmmax)) > shminfo.shmall) + shminfo.shmall = atop(round_page(shminfo.shmmax)); return (0); case KERN_SHMINFO_SHMMIN: val = shminfo.shmmin; |