Use the PAGE_* forms (instead of the ancient BSD forms) in param.h,

because param.h will get a kick in the head sometime in the future.
One day, maybe both can become invisible, but we boot one of them
first.
ok guenter

4 files changed, 19 insertions, 19 deletions

diff --git a/lib/libkvm/kvm_amd64.c b/lib/libkvm/kvm_amd64.c
index 7923092cef2..c6c6b77ddf2 100644
--- a/lib/libkvm/kvm_amd64.c
+++ b/lib/libkvm/kvm_amd64.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_amd64.c,v 1.7 2009/03/30 21:16:14 kettenis Exp $	*/
+/*	$OpenBSD: kvm_amd64.c,v 1.8 2012/07/09 08:43:10 deraadt Exp $	*/
 /*	$NetBSD: kvm_x86_64.c,v 1.3 2002/06/05 22:01:55 fvdl Exp $	*/
 
 /*-
@@ -98,11 +98,11 @@ _kvm_kvatop(kvm_t *kd, u_long va, paddr_t *pa)
 		return (0);
 	}
 
-	page_off = va & PGOFSET;
+	page_off = va & PAGE_MASK;
 
 	if (va >= PMAP_DIRECT_BASE && va <= PMAP_DIRECT_END) {
 		*pa = va - PMAP_DIRECT_BASE;
-		return (int)(NBPG - page_off);
+		return (int)(PAGE_SIZE - page_off);
 	}
 
 	cpu_kh = kd->cpu_data;
@@ -179,7 +179,7 @@ _kvm_kvatop(kvm_t *kd, u_long va, paddr_t *pa)
 		goto lose;
 	}
 	*pa = (pte & PG_FRAME) + page_off;
-	return (int)(NBPG - page_off);
+	return (int)(PAGE_SIZE - page_off);
 
  lose:
 	*pa = (u_long)~0L;
diff --git a/lib/libkvm/kvm_i386.c b/lib/libkvm/kvm_i386.c
index 78faab55c3d..a270d67eac5 100644
--- a/lib/libkvm/kvm_i386.c
+++ b/lib/libkvm/kvm_i386.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_i386.c,v 1.21 2009/10/27 23:59:28 deraadt Exp $ */
+/*	$OpenBSD: kvm_i386.c,v 1.22 2012/07/09 08:43:10 deraadt Exp $ */
 /*	$NetBSD: kvm_i386.c,v 1.9 1996/03/18 22:33:38 thorpej Exp $	*/
 
 /*-
@@ -101,10 +101,10 @@ _kvm_initvtop(kvm_t *kd)
 	    (off_t)_kvm_pa2off(kd, nl[0].n_value - KERNBASE)) != sizeof pa)
 		goto invalid;
 
-	vm->PTD = (pd_entry_t *)_kvm_malloc(kd, NBPG);
+	vm->PTD = (pd_entry_t *)_kvm_malloc(kd, PAGE_SIZE);
 
-	if (_kvm_pread(kd, kd->pmfd, vm->PTD, NBPG,
-	    (off_t)_kvm_pa2off(kd, pa)) != NBPG)
+	if (_kvm_pread(kd, kd->pmfd, vm->PTD, PAGE_SIZE,
+	    (off_t)_kvm_pa2off(kd, pa)) != PAGE_SIZE)
 		goto invalid;
 
 	return (0);
@@ -138,7 +138,7 @@ _kvm_kvatop(kvm_t *kd, u_long va, paddr_t *pa)
 	}
 
 	vm = kd->vmst;
-	offset = va & PGOFSET;
+	offset = va & PAGE_MASK;
 
 	/*
 	 * If we are initializing (kernel page table descriptor pointer
@@ -146,7 +146,7 @@ _kvm_kvatop(kvm_t *kd, u_long va, paddr_t *pa)
 	 */
 	if (vm->PTD == NULL) {
 		*pa = va;
-		return (NBPG - (int)offset);
+		return (PAGE_SIZE - (int)offset);
 	}
 	if ((vm->PTD[pdei(va)] & PG_V) == 0)
 		goto invalid;
@@ -160,7 +160,7 @@ _kvm_kvatop(kvm_t *kd, u_long va, paddr_t *pa)
 		goto invalid;
 
 	*pa = (pte & PG_FRAME) + offset;
-	return (NBPG - (int)offset);
+	return (PAGE_SIZE - (int)offset);
 
 invalid:
 	_kvm_err(kd, 0, "invalid address (%lx)", va);
diff --git a/lib/libkvm/kvm_m68k.c b/lib/libkvm/kvm_m68k.c
index c5fc38508b2..b66552b392f 100644
--- a/lib/libkvm/kvm_m68k.c
+++ b/lib/libkvm/kvm_m68k.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_m68k.c,v 1.19 2009/10/27 23:59:28 deraadt Exp $ */
+/*	$OpenBSD: kvm_m68k.c,v 1.20 2012/07/09 08:43:10 deraadt Exp $ */
 /*	$NetBSD: kvm_m68k.c,v 1.9 1996/05/07 06:09:11 leo Exp $	*/
 
 /*-
@@ -67,8 +67,8 @@
 #include <machine/kcore.h>
 
 #ifndef btop
-#define	btop(x)		(((unsigned)(x)) >> PGSHIFT)	/* XXX */
-#define	ptob(x)		((caddr_t)((x) << PGSHIFT))	/* XXX */
+#define	btop(x)		(((unsigned)(x)) >> PAGE_SHIFT)	/* XXX */
+#define	ptob(x)		((caddr_t)((x) << PAGE_SHIFT))	/* XXX */
 #endif
 
 void
@@ -97,7 +97,7 @@ _kvm_vatop(kvm_t *kd, st_entry_t *sta, u_long va, u_long *pa)
 		_kvm_err(kd, 0, "vatop called in live kernel!");
 		return (0);
 	}
-	offset = va & PGOFSET;
+	offset = va & PAGE_MASK;
 	cpu_kh = kd->cpu_data;
 	/*
 	 * If we are initializing (kernel segment table pointer not yet set)
@@ -105,7 +105,7 @@ _kvm_vatop(kvm_t *kd, st_entry_t *sta, u_long va, u_long *pa)
 	 */
 	if (cpu_kh->sysseg_pa == 0) {
 		*pa = va + cpu_kh->kernel_pa;
-		return (NBPG - offset);
+		return (PAGE_SIZE - offset);
 	}
 	if (cpu_kh->mmutype == MMU_68040 || cpu_kh->mmutype == MMU_68060) {
 		st_entry_t *sta2;
@@ -174,7 +174,7 @@ _kvm_vatop(kvm_t *kd, st_entry_t *sta, u_long va, u_long *pa)
 	}
 	*pa = addr + offset;
 
-	return (NBPG - offset);
+	return (PAGE_SIZE - offset);
 invalid:
 	_kvm_err(kd, 0, "invalid address (%lx)", va);
 	return (0);
diff --git a/lib/libkvm/kvm_sh.c b/lib/libkvm/kvm_sh.c
index 0797b20aa18..4a5ccc3c24f 100644
--- a/lib/libkvm/kvm_sh.c
+++ b/lib/libkvm/kvm_sh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_sh.c,v 1.3 2011/04/10 11:51:57 miod Exp $	*/
+/*	$OpenBSD: kvm_sh.c,v 1.4 2012/07/09 08:43:10 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2007 Miodrag Vallat.
@@ -58,7 +58,7 @@ _kvm_initvtop(kvm_t *kd)
 #define	__PMAP_PTP_SHIFT	22
 #define	__PMAP_PTP_PG_N		(PAGE_SIZE / sizeof(pt_entry_t))
 #define	__PMAP_PTP_INDEX(va)	(((va) >> __PMAP_PTP_SHIFT) & (__PMAP_PTP_N - 1))
-#define	__PMAP_PTP_OFSET(va)	((va >> PGSHIFT) & (__PMAP_PTP_PG_N - 1))
+#define	__PMAP_PTP_OFSET(va)	((va >> PAGE_SHIFT) & (__PMAP_PTP_PG_N - 1))
 
 int
 _kvm_kvatop(kvm_t *kd, u_long va, paddr_t *pa)