diff options
| author | phk <phk@FreeBSD.org> | 1996-05-02 14:21:14 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1996-05-02 14:21:14 +0000 |
| commit | 5a6fb3a7da69f11fbe5093f4a2cc7a4d86df5b36 (patch) | |
| tree | c11aef2f7af5663393e978cd03a223a2ffbe6c69 /sys/kern/sysv_shm.c | |
| parent | 189514aa416a464e44c25c45746e8ed5e850f03d (diff) | |
| download | FreeBSD-src-5a6fb3a7da69f11fbe5093f4a2cc7a4d86df5b36.zip FreeBSD-src-5a6fb3a7da69f11fbe5093f4a2cc7a4d86df5b36.tar.gz | |
removed:
CLBYTES PD_SHIFT PGSHIFT NBPG PGOFSET CLSIZELOG2 CLSIZE pdei()
ptei() kvtopte() ptetov() ispt() ptetoav() &c &c
new:
NPDEPG
Major macro cleanup.
Diffstat (limited to 'sys/kern/sysv_shm.c')
| -rw-r--r-- | sys/kern/sysv_shm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index a68f8a6..12cef8a 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -1,4 +1,4 @@ -/* $Id: sysv_shm.c,v 1.17 1996/01/05 16:38:03 wollman Exp $ */ +/* $Id: sysv_shm.c,v 1.18 1996/02/23 18:49:18 peter Exp $ */ /* $NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $ */ /* @@ -141,7 +141,7 @@ shm_deallocate_segment(shmseg) size_t size; shm_handle = shmseg->shm_internal; - size = (shmseg->shm_segsz + CLOFSET) & ~CLOFSET; + size = (shmseg->shm_segsz + PAGE_SIZE-1) & ~(PAGE_SIZE-1); (void) vm_map_remove(sysvshm_map, shm_handle->kva, shm_handle->kva + size); free((caddr_t)shm_handle, M_SHM); shmseg->shm_internal = NULL; @@ -161,7 +161,7 @@ shm_delete_mapping(p, shmmap_s) segnum = IPCID_TO_IX(shmmap_s->shmid); shmseg = &shmsegs[segnum]; - size = (shmseg->shm_segsz + CLOFSET) & ~CLOFSET; + size = (shmseg->shm_segsz + PAGE_SIZE-1) & ~(PAGE_SIZE-1); result = vm_map_remove(&p->p_vmspace->vm_map, shmmap_s->va, shmmap_s->va + size); if (result != KERN_SUCCESS) return EINVAL; @@ -246,7 +246,7 @@ shmat(p, uap, retval) } if (i >= shminfo.shmseg) return EMFILE; - size = (shmseg->shm_segsz + CLOFSET) & ~CLOFSET; + size = (shmseg->shm_segsz + PAGE_SIZE-1) & ~(PAGE_SIZE-1); prot = VM_PROT_READ; if ((uap->shmflg & SHM_RDONLY) == 0) prot |= VM_PROT_WRITE; @@ -463,7 +463,7 @@ shmget_allocate_segment(p, uap, mode, retval) return EINVAL; if (shm_nused >= shminfo.shmmni) /* any shmids left? */ return ENOSPC; - size = (uap->size + CLOFSET) & ~CLOFSET; + size = (shmseg->shm_segsz + PAGE_SIZE-1) & ~(PAGE_SIZE-1); if (shm_committed + btoc(size) > shminfo.shmall) return ENOMEM; if (shm_last_free < 0) { @@ -605,7 +605,7 @@ shminit(dummy) /* actually this *should* be pageable. SHM_{LOCK,UNLOCK} */ sysvshm_map = kmem_suballoc(kernel_map, &garbage1, &garbage2, - shminfo.shmall * NBPG, TRUE); + shminfo.shmall * PAGE_SIZE, TRUE); for (i = 0; i < shminfo.shmmni; i++) { shmsegs[i].shm_perm.mode = SHMSEG_FREE; shmsegs[i].shm_perm.seq = 0; |
