removed:

        CLBYTES PD_SHIFT PGSHIFT NBPG PGOFSET CLSIZELOG2 CLSIZE pdei()
        ptei() kvtopte() ptetov() ispt() ptetoav() &c &c
new:
        NPDEPG

Major macro cleanup.

6 files changed, 21 insertions, 21 deletions

diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 3bd7721..bfdc4bb 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_malloc.c	8.3 (Berkeley) 1/4/94
- * $Id: kern_malloc.c,v 1.19 1996/01/29 11:12:37 davidg Exp $
+ * $Id: kern_malloc.c,v 1.20 1996/05/02 10:43:17 phk Exp $
  */
 
 #include <sys/param.h>
@@ -141,7 +141,7 @@ malloc(size, type, flags)
 			allocsize = roundup(size, PAGE_SIZE);
 		else
 			allocsize = 1 << indx;
-		npg = clrnd(btoc(allocsize));
+		npg = btoc(allocsize);
 		va = (caddr_t) kmem_malloc(kmem_map, (vm_size_t)ctob(npg), flags);
 		if (va == NULL) {
 			splx(s);
@@ -171,7 +171,7 @@ malloc(size, type, flags)
 		 * bucket, don't assume the list is still empty.
 		 */
 		savedlist = kbp->kb_next;
-		kbp->kb_next = cp = va + (npg * NBPG) - allocsize;
+		kbp->kb_next = cp = va + (npg * PAGE_SIZE) - allocsize;
 		for (;;) {
 			freep = (struct freelist *)cp;
 #ifdef DIAGNOSTIC
@@ -298,7 +298,7 @@ free(addr, type)
 	if (size > MAXALLOCSAVE) {
 		kmem_free(kmem_map, (vm_offset_t)addr, ctob(kup->ku_pagecnt));
 #ifdef KMEMSTATS
-		size = kup->ku_pagecnt << PGSHIFT;
+		size = kup->ku_pagecnt << PAGE_SHIFT;
 		ksp->ks_memuse -= size;
 		kup->ku_indx = 0;
 		kup->ku_pagecnt = 0;
diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c
index a49c1d0..da221c8 100644
--- a/sys/kern/subr_param.c
+++ b/sys/kern/subr_param.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.c	8.3 (Berkeley) 8/20/94
- * $Id: param.c,v 1.16 1996/03/11 05:52:50 hsu Exp $
+ * $Id: param.c,v 1.17 1996/05/02 10:42:51 phk Exp $
  */
 
 #include "opt_sysvipc.h"
@@ -115,7 +115,7 @@ int	fscale = FSCALE;	/* kernel uses `FSCALE', user uses `fscale' */
 #define	SHMSEG	8
 #endif
 #ifndef SHMALL
-#define	SHMALL	(SHMMAXPGS/CLSIZE)
+#define	SHMALL	(SHMMAXPGS)
 #endif
 
 struct	shminfo shminfo = {
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index 583963c..f01629a 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sys_process.c,v 1.21 1996/01/24 18:29:00 peter Exp $
+ *	$Id: sys_process.c,v 1.22 1996/03/30 15:02:58 peter Exp $
  */
 
 #include <sys/param.h>
@@ -413,7 +413,7 @@ ptrace(curp, uap, retval)
 		return (error);
 
 	case PT_READ_U:
-		if ((u_int)uap->addr > (UPAGES * NBPG - sizeof(int))) {
+		if ((u_int)uap->addr > (UPAGES * PAGE_SIZE - sizeof(int))) {
 			return EFAULT;
 		}
 		error = 0;
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;
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 188a132..7815b6d 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty.c	8.8 (Berkeley) 1/21/94
- * $Id: tty.c,v 1.79 1996/03/02 18:24:06 peter Exp $
+ * $Id: tty.c,v 1.80 1996/03/11 06:05:03 hsu Exp $
  */
 
 /*-
@@ -2199,7 +2199,7 @@ ttyinfo(tp)
 		ttyprintf(tp, "%d.%02ds ",
 		    stime.tv_sec, stime.tv_usec / 10000);
 
-#define	pgtok(a)	(((a) * NBPG) / 1024)
+#define	pgtok(a)	(((a) * PAGE_SIZE) / 1024)
 		/* Print percentage cpu, resident set size. */
 		tmp = (pick->p_pctcpu * 10000 + FSCALE / 2) >> FSHIFT;
 		ttyprintf(tp, "%d%% %dk\n",
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index cb79083..1272bed 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_mbuf.c	8.2 (Berkeley) 1/4/94
- * $Id: uipc_mbuf.c,v 1.16 1995/12/07 12:46:59 davidg Exp $
+ * $Id: uipc_mbuf.c,v 1.17 1995/12/14 08:32:06 phk Exp $
  */
 
 #include <sys/param.h>
@@ -71,8 +71,8 @@ mbinit(dummy)
 {
 	int s;
 
-#if CLBYTES < 4096
-#define NCL_INIT	(4096/CLBYTES)
+#if PAGE_SIZE < 4096
+#define NCL_INIT	(4096/PAGE_SIZE)
 #else
 #define NCL_INIT	1
 #endif
@@ -108,7 +108,7 @@ m_clalloc(ncl, nowait)
 	if (mb_map_full)
 		return (0);
 
-	npg = ncl * CLSIZE;
+	npg = ncl;
 	p = (caddr_t)kmem_malloc(mb_map, ctob(npg),
 				 nowait ? M_NOWAIT : M_WAITOK);
 	/*
@@ -118,7 +118,7 @@ m_clalloc(ncl, nowait)
 	if (p == NULL)
 		return (0);
 
-	ncl = ncl * CLBYTES / MCLBYTES;
+	ncl = ncl * PAGE_SIZE / MCLBYTES;
 	for (i = 0; i < ncl; i++) {
 		((union mcluster *)p)->mcl_next = mclfree;
 		mclfree = (union mcluster *)p;