Another sweep over the pmap/vm macros, this time with more focus on

the usage.  I'm not satisfied with the naming, but now at least there is
less bogus stuff around.

6 files changed, 17 insertions, 18 deletions

diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index eb2c9dd..8b1ddf2 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)device_pager.c	8.1 (Berkeley) 6/11/93
- * $Id: device_pager.c,v 1.20 1996/01/19 03:59:38 dyson Exp $
+ * $Id: device_pager.c,v 1.21 1996/03/09 06:54:41 dyson Exp $
  */
 
 #include <sys/param.h>
@@ -119,7 +119,7 @@ dev_pager_alloc(handle, size, prot, foff)
 	/*
 	 * Offset should be page aligned.
 	 */
-	if (foff & (PAGE_SIZE - 1))
+	if (foff & PAGE_MASK)
 		return (NULL);
 
 	/*
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index d548931..b6c7db6 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -39,7 +39,7 @@
  * from: Utah $Hdr: swap_pager.c 1.4 91/04/30$
  *
  *	@(#)swap_pager.c	8.9 (Berkeley) 3/21/94
- * $Id: swap_pager.c,v 1.63 1996/03/06 04:31:46 dyson Exp $
+ * $Id: swap_pager.c,v 1.64 1996/05/02 14:21:14 phk Exp $
  */
 
 /*
@@ -304,13 +304,13 @@ swap_pager_alloc(handle, size, prot, offset)
 			 * rip support of "named anonymous regions" out altogether.
 			 */
 			object = vm_object_allocate(OBJT_SWAP,
-				OFF_TO_IDX(offset + PAGE_SIZE - 1) + size);
+				OFF_TO_IDX(offset + PAGE_MASK) + size);
 			object->handle = handle;
 			(void) swap_pager_swp_alloc(object, M_WAITOK);
 		}
 	} else {
 		object = vm_object_allocate(OBJT_SWAP,
-			OFF_TO_IDX(offset + PAGE_SIZE - 1) + size);
+			OFF_TO_IDX(offset + PAGE_MASK) + size);
 		(void) swap_pager_swp_alloc(object, M_WAITOK);
 	}
 
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 606e1c5..6195309 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_map.c,v 1.42 1996/04/03 05:23:38 dyson Exp $
+ * $Id: vm_map.c,v 1.43 1996/04/29 22:04:57 dyson Exp $
  */
 
 /*
@@ -214,7 +214,7 @@ vmspace_alloc(min, max, pageable)
 	if (mapvmpgcnt == 0 && mapvm == 0) {
 		int s;
 
-		mapvmpgcnt = (cnt.v_page_count * sizeof(struct vm_map_entry) + PAGE_SIZE - 1) / PAGE_SIZE;
+		mapvmpgcnt = btoc(cnt.v_page_count * sizeof(struct vm_map_entry));
 		s = splhigh();
 		mapvm_start = mapvm = kmem_alloc_pageable(kernel_map, mapvmpgcnt * PAGE_SIZE);
 		mapvmmax = mapvm_start + mapvmpgcnt * PAGE_SIZE;
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index 72a3b6b..ede01dc 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -38,7 +38,7 @@
  * from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$
  *
  *	@(#)vm_mmap.c	8.4 (Berkeley) 1/12/94
- * $Id: vm_mmap.c,v 1.39 1996/03/12 02:27:20 dyson Exp $
+ * $Id: vm_mmap.c,v 1.40 1996/03/16 15:00:05 davidg Exp $
  */
 
 /*
@@ -767,7 +767,7 @@ vm_mmap(map, addr, size, prot, maxprot, flags, handle, foff)
 		docow = MAP_COPY_ON_WRITE;
 		if (objsize < size) {
 			object2 = vm_object_allocate( OBJT_DEFAULT,
-				OFF_TO_IDX(size - (foff & ~(PAGE_SIZE - 1))));
+				OFF_TO_IDX(size - (foff & ~PAGE_MASK)));
 			object2->backing_object = object;
 			object2->backing_object_offset = foff;
 			TAILQ_INSERT_TAIL(&object->shadow_head,
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index aa3839d..63ebdd9 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pager.c,v 1.20 1995/12/11 04:58:29 dyson Exp $
+ * $Id: vm_pager.c,v 1.21 1995/12/14 09:55:11 phk Exp $
  */
 
 /*
@@ -143,7 +143,6 @@ vm_pager_bufferinit()
 	}
 	bp->b_rcred = bp->b_wcred = NOCRED;
 	bp->b_vnbufs.le_next = NOLIST;
-	bp->b_actf = NULL;
 
 	swapbkva = kmem_alloc_pageable(pager_map, nswbuf * MAXPHYS);
 	if (!swapbkva)
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index 773c5f6..4cef671 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vnode_pager.c	7.5 (Berkeley) 4/20/91
- *	$Id: vnode_pager.c,v 1.58 1996/01/19 04:00:31 dyson Exp $
+ *	$Id: vnode_pager.c,v 1.59 1996/03/19 05:13:22 dyson Exp $
  */
 
 /*
@@ -295,10 +295,10 @@ vnode_pager_setsize(vp, nsize)
 	 */
 	if (nsize < object->un_pager.vnp.vnp_size) {
 		vm_ooffset_t nsizerounded;
-		nsizerounded = IDX_TO_OFF(OFF_TO_IDX(nsize + PAGE_SIZE - 1));
+		nsizerounded = IDX_TO_OFF(OFF_TO_IDX(nsize + PAGE_MASK));
 		if (nsizerounded < object->un_pager.vnp.vnp_size) {
 			vm_object_page_remove(object,
-				OFF_TO_IDX(nsize + PAGE_SIZE - 1),
+				OFF_TO_IDX(nsize + PAGE_MASK),
 				OFF_TO_IDX(object->un_pager.vnp.vnp_size),
 				FALSE);
 		}
@@ -320,7 +320,7 @@ vnode_pager_setsize(vp, nsize)
 		}
 	}
 	object->un_pager.vnp.vnp_size = nsize;
-	object->size = OFF_TO_IDX(nsize + PAGE_SIZE - 1);
+	object->size = OFF_TO_IDX(nsize + PAGE_MASK);
 }
 
 void
@@ -518,9 +518,9 @@ vnode_pager_input_smlfs(object, m)
 			if (error)
 				break;
 
-			vm_page_set_validclean(m, (i * bsize) & (PAGE_SIZE-1), bsize);
+			vm_page_set_validclean(m, (i * bsize) & PAGE_MASK, bsize);
 		} else {
-			vm_page_set_validclean(m, (i * bsize) & (PAGE_SIZE-1), bsize);
+			vm_page_set_validclean(m, (i * bsize) & PAGE_MASK, bsize);
 			bzero((caddr_t) kva + i * bsize, bsize);
 		}
 	}
@@ -897,7 +897,7 @@ vnode_pager_leaf_putpages(object, m, count, sync, rtvals)
 			maxsize = object->un_pager.vnp.vnp_size - poffset;
 		else
 			maxsize = 0;
-		ncount = (maxsize + PAGE_SIZE - 1) / PAGE_SIZE;
+		ncount = btoc(maxsize);
 		if (ncount < count) {
 			for (i = ncount; i < count; i++) {
 				rtvals[i] = VM_PAGER_BAD;