PGSHIFT and PGOFSET are now contained inside the kernel namespace.

15 files changed, 45 insertions, 45 deletions

diff --git a/sys/arch/alpha/include/param.h b/sys/arch/alpha/include/param.h
index 9a23f0dd28b..83e2b2076da 100644
--- a/sys/arch/alpha/include/param.h
+++ b/sys/arch/alpha/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.38 2013/03/25 17:46:24 deraadt Exp $ */
+/* $OpenBSD: param.h,v 1.39 2013/03/26 05:04:08 deraadt Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -50,14 +50,14 @@
 #define	PAGE_SHIFT	13
 #define	PAGE_SIZE	(1 << PAGE_SHIFT)
 #define	PAGE_MASK	(PAGE_SIZE - 1)
-#define	PGSHIFT		PAGE_SHIFT		/* LOG2(PAGE_SIZE) */
-#define	PGOFSET		PAGE_MASK		/* byte offset into page */
 
 #define	KERNBASE	0xfffffc0000580000	/* start of kernel virtual */
 
 #ifdef _KERNEL
 
 #define	NBPG		PAGE_SIZE		/* bytes/page */
+#define	PGSHIFT		PAGE_SHIFT		/* LOG2(PAGE_SIZE) */
+#define	PGOFSET		PAGE_MASK		/* byte offset into page */
 
 #define	UPAGES		2			/* pages of u-area */
 #define	USPACE		(UPAGES * PAGE_SIZE)	/* total size of u-area */
diff --git a/sys/arch/amd64/include/param.h b/sys/arch/amd64/include/param.h
index 75657dd575b..29c314fdeee 100644
--- a/sys/arch/amd64/include/param.h
+++ b/sys/arch/amd64/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.21 2013/03/25 17:46:24 deraadt Exp $	*/
+/*	$OpenBSD: param.h,v 1.22 2013/03/26 05:04:10 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -52,8 +52,6 @@
 #define	PAGE_SHIFT	12
 #define	PAGE_SIZE	(1 << PAGE_SHIFT)
 #define	PAGE_MASK	(PAGE_SIZE - 1)
-#define	PGSHIFT		PAGE_SHIFT		/* LOG2(PAGE_SIZE) */
-#define	PGOFSET		PAGE_MASK		/* byte offset into page */
 
 #define	KERNBASE	0xffffffff80000000	/* start of kernel virtual space */
 
@@ -67,6 +65,8 @@
 #define	KERNBASE_LO	0x80000000
 
 #define	NBPG		PAGE_SIZE		/* bytes/page */
+#define	PGSHIFT		PAGE_SHIFT		/* LOG2(PAGE_SIZE) */
+#define	PGOFSET		PAGE_MASK		/* byte offset into page */
 
 #define	UPAGES		5			/* pages of u-area */
 #define	USPACE		(UPAGES * PAGE_SIZE)	/* total size of u-area */
diff --git a/sys/arch/arm/include/param.h b/sys/arch/arm/include/param.h
index d276bbd6b11..a9df9e89392 100644
--- a/sys/arch/arm/include/param.h
+++ b/sys/arch/arm/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.19 2013/03/25 17:46:24 deraadt Exp $	*/
+/*	$OpenBSD: param.h,v 1.20 2013/03/26 05:04:10 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe.
@@ -42,14 +42,14 @@
 #define	PAGE_SHIFT	12
 #define	PAGE_SIZE	(1 << PAGE_SHIFT)
 #define	PAGE_MASK	(PAGE_SIZE - 1)
-#define	PGSHIFT		PAGE_SHIFT
-#define	PGOFSET		PAGE_MASK
 
 #ifdef _KERNEL
 
 #define	NPTEPG		(PAGE_SIZE/(sizeof (pt_entry_t)))
 
 #define	NBPG		PAGE_SIZE
+#define	PGSHIFT		PAGE_SHIFT
+#define	PGOFSET		PAGE_MASK
 
 #define	UPAGES		2			/* pages of u-area */
 #define	USPACE		(UPAGES * PAGE_SIZE)	/* total size of u-area */
diff --git a/sys/arch/hppa/include/param.h b/sys/arch/hppa/include/param.h
index 071d196338e..8c7d774d3f7 100644
--- a/sys/arch/hppa/include/param.h
+++ b/sys/arch/hppa/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.44 2013/03/25 17:46:24 deraadt Exp $	*/
+/*	$OpenBSD: param.h,v 1.45 2013/03/26 05:04:10 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1988-1994, The University of Utah and
@@ -38,14 +38,14 @@
 #define	PAGE_SHIFT	12
 #define	PAGE_SIZE	(1 << PAGE_SHIFT)
 #define	PAGE_MASK	(PAGE_SIZE - 1)
-#define	PGSHIFT		PAGE_SHIFT		/* LOG2(PAGE_SIZE) */
-#define	PGOFSET		PAGE_MASK		/* byte offset into page */
 
 #define	KERNBASE	0x00000000		/* start of kernel virtual */
 
 #ifdef _KERNEL
 
 #define	NBPG		PAGE_SIZE		/* bytes/page */
+#define	PGSHIFT		PAGE_SHIFT		/* LOG2(PAGE_SIZE) */
+#define	PGOFSET		PAGE_MASK		/* byte offset into page */
 
 #define	UPAGES		4			/* pages of u-area */
 #define	USPACE		(UPAGES * PAGE_SIZE)	/* total size of u-area */
diff --git a/sys/arch/hppa64/include/param.h b/sys/arch/hppa64/include/param.h
index d7512881eca..1d97d7cd9a8 100644
--- a/sys/arch/hppa64/include/param.h
+++ b/sys/arch/hppa64/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.19 2013/03/25 17:46:24 deraadt Exp $	*/
+/*	$OpenBSD: param.h,v 1.20 2013/03/26 05:04:10 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1988-1994, The University of Utah and
@@ -38,14 +38,14 @@
 #define	PAGE_SHIFT	12
 #define	PAGE_SIZE	(1 << PAGE_SHIFT)
 #define	PAGE_MASK	(PAGE_SIZE - 1)
-#define	PGSHIFT		PAGE_SHIFT		/* LOG2(NBPG) */
-#define	PGOFSET		PAGE_MASK		/* byte offset into page */
 
 #define	KERNBASE	0x00000000		/* start of kernel virtual */
 
 #ifdef _KERNEL
 
 #define	NBPG		PAGE_SIZE		/* bytes/page */
+#define	PGSHIFT		PAGE_SHIFT		/* LOG2(NBPG) */
+#define	PGOFSET		PAGE_MASK		/* byte offset into page */
 
 #define	UPAGES		5			/* pages of u-area */
 #define	USPACE		(UPAGES * PAGE_SIZE)	/* total size of u-area */
diff --git a/sys/arch/i386/include/param.h b/sys/arch/i386/include/param.h
index 2561744584f..986016b6b30 100644
--- a/sys/arch/i386/include/param.h
+++ b/sys/arch/i386/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.46 2013/03/25 17:46:24 deraadt Exp $	*/
+/*	$OpenBSD: param.h,v 1.47 2013/03/26 05:04:10 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -52,8 +52,6 @@
 #define	PAGE_SHIFT	12
 #define	PAGE_SIZE	(1 << PAGE_SHIFT)
 #define	PAGE_MASK	(PAGE_SIZE - 1)
-#define	PGSHIFT		PAGE_SHIFT		/* LOG2(PAGE_SIZE) */
-#define	PGOFSET		PAGE_MASK		/* byte offset into page */
 
 #define	KERNBASE	0xd0000000
 
@@ -62,6 +60,8 @@
 #define	KERNTEXTOFF	(KERNBASE+0x200000)	/* start of kernel text */
 
 #define	NBPG		PAGE_SIZE		/* bytes/page */
+#define	PGSHIFT		PAGE_SHIFT		/* LOG2(PAGE_SIZE) */
+#define	PGOFSET		PAGE_MASK		/* byte offset into page */
 
 #define	UPAGES		2			/* pages of u-area */
 #define	USPACE		(UPAGES * PAGE_SIZE)	/* total size of u-area */
diff --git a/sys/arch/m68k/include/param.h b/sys/arch/m68k/include/param.h
index 9e060080f2d..8ac504a3545 100644
--- a/sys/arch/m68k/include/param.h
+++ b/sys/arch/m68k/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.30 2013/03/25 18:17:22 miod Exp $	*/
+/*	$OpenBSD: param.h,v 1.31 2013/03/26 05:04:10 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,8 +43,6 @@
 
 #define	PAGE_SIZE	(1 << PAGE_SHIFT)
 #define	PAGE_MASK	(PAGE_SIZE - 1)
-#define	PGSHIFT		PAGE_SHIFT
-#define	PGOFSET		PAGE_MASK
 
 #ifdef _KERNEL
 
@@ -53,6 +51,8 @@
 #define	BTOPKERNBASE	((u_long)KERNBASE >> PAGE_SHIFT)
 
 #define	NBPG		PAGE_SIZE
+#define	PGSHIFT		PAGE_SHIFT
+#define	PGOFSET		PAGE_MASK
 
 #define	UPAGES		2			/* pages of u-area */
 #define	USPACE		(UPAGES * PAGE_SIZE)	/* total size of u-area */
diff --git a/sys/arch/m88k/include/param.h b/sys/arch/m88k/include/param.h
index b20bd117518..b3b4db67d20 100644
--- a/sys/arch/m88k/include/param.h
+++ b/sys/arch/m88k/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.17 2013/03/25 17:46:24 deraadt Exp $ */
+/*	$OpenBSD: param.h,v 1.18 2013/03/26 05:04:10 deraadt Exp $ */
 
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -51,14 +51,14 @@
 #define	PAGE_SHIFT	12
 #define	PAGE_SIZE	(1 << PAGE_SHIFT)
 #define	PAGE_MASK	(PAGE_SIZE - 1)
-#define	PGSHIFT		PAGE_SHIFT		/* LOG2(PAGE_SIZE) */
-#define	PGOFSET		PAGE_SIZE		/* byte offset into page */
 
 #define	NPTEPG		(PAGE_SIZE / (sizeof(pt_entry_t)))
 
 #ifdef _KERNEL
 
 #define	NBPG		PAGE_SIZE
+#define	PGSHIFT		PAGE_SHIFT		/* LOG2(PAGE_SIZE) */
+#define	PGOFSET		PAGE_SIZE		/* byte offset into page */
 
 #define	UPAGES		2			/* pages of u-area */
 #define	USPACE		(UPAGES * PAGE_SIZE)	/* total size of u-area */
diff --git a/sys/arch/mips64/include/param.h b/sys/arch/mips64/include/param.h
index 9721822f720..d15cd70a1b9 100644
--- a/sys/arch/mips64/include/param.h
+++ b/sys/arch/mips64/include/param.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: param.h,v 1.32 2013/03/25 17:46:24 deraadt Exp $ */
+/*      $OpenBSD: param.h,v 1.33 2013/03/26 05:04:10 deraadt Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,14 +43,14 @@
 
 #define	PAGE_SIZE	(1 << PAGE_SHIFT)
 #define	PAGE_MASK	(PAGE_SIZE - 1)
-#define	PGSHIFT		PAGE_SHIFT
-#define	PGOFSET		PAGE_MASK
 
 #define	KERNBASE	0xffffffff80000000L	/* start of kernel virtual */
 
 #ifdef _KERNEL
 
 #define	NBPG		PAGE_SIZE
+#define	PGSHIFT		PAGE_SHIFT
+#define	PGOFSET		PAGE_MASK
 
 #define	USPACE		16384
 #define	UPAGES		(USPACE >> PAGE_SHIFT)
diff --git a/sys/arch/powerpc/include/param.h b/sys/arch/powerpc/include/param.h
index 9701cce43d1..78c139449cb 100644
--- a/sys/arch/powerpc/include/param.h
+++ b/sys/arch/powerpc/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.34 2013/03/25 17:46:24 deraadt Exp $	*/
+/*	$OpenBSD: param.h,v 1.35 2013/03/26 05:04:10 deraadt Exp $	*/
 
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -47,12 +47,12 @@
 #define	PAGE_SHIFT	12
 #define	PAGE_SIZE	(1 << PAGE_SHIFT)
 #define	PAGE_MASK	(PAGE_SIZE - 1)
-#define	PGSHIFT		PAGE_SHIFT
-#define	PGOFSET		PAGE_MASK
 
 #ifdef _KERNEL
 
 #define	NBPG		PAGE_SIZE
+#define	PGSHIFT		PAGE_SHIFT
+#define	PGOFSET		PAGE_MASK
 
 #define	UPAGES		4			/* pages of u-area */
 #define	USPACE		(UPAGES * PAGE_SIZE)	/* total size of u-area */
diff --git a/sys/arch/sh/include/param.h b/sys/arch/sh/include/param.h
index 5c0c9620ded..6a2798e652b 100644
--- a/sys/arch/sh/include/param.h
+++ b/sys/arch/sh/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.10 2013/03/25 17:46:24 deraadt Exp $	*/
+/*	$OpenBSD: param.h,v 1.11 2013/03/26 05:04:10 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
@@ -54,12 +54,12 @@
 #define	PAGE_SHIFT		12
 #define	PAGE_SIZE		(1 << PAGE_SHIFT)
 #define	PAGE_MASK		(PAGE_SIZE - 1)
-#define	PGSHIFT			PAGE_SHIFT
-#define	PGOFSET			PAGE_MASK
 
 #ifdef _KERNEL
 
 #define	NBPG			PAGE_SIZE
+#define	PGSHIFT			PAGE_SHIFT
+#define	PGOFSET			PAGE_MASK
 
 #endif
 
diff --git a/sys/arch/solbourne/include/param.h b/sys/arch/solbourne/include/param.h
index f070b52dd08..2667b5babc9 100644
--- a/sys/arch/solbourne/include/param.h
+++ b/sys/arch/solbourne/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.12 2013/03/25 17:46:24 deraadt Exp $	*/
+/*	$OpenBSD: param.h,v 1.13 2013/03/26 05:04:10 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -58,8 +58,6 @@
 #define	PAGE_SHIFT	SUN4_PGSHIFT
 #define	PAGE_SIZE	(1 << PAGE_SHIFT)
 #define	PAGE_MASK	(PAGE_SIZE - 1)
-#define	PGSHIFT		PAGE_SHIFT		/* LOG2(PAGE_SIZE) */
-#define	PGOFSET		PAGE_MASK		/* byte offset into page */
 
 #define	KERNBASE	0xfd080000
 
@@ -69,6 +67,8 @@
 #define	MSGBUF_PA	PTW1_TO_PHYS(KERNBASE)	/* msgbuf physical address */
 
 #define	NBPG		PAGE_SIZE		/* bytes/page */
+#define	PGSHIFT		PAGE_SHIFT		/* LOG2(PAGE_SIZE) */
+#define	PGOFSET		PAGE_MASK		/* byte offset into page */
 
 #define UPAGES		1
 #define	USPACE		8192		/* total size of u-area */
diff --git a/sys/arch/sparc/include/param.h b/sys/arch/sparc/include/param.h
index 71fd9a87604..8a5ee594150 100644
--- a/sys/arch/sparc/include/param.h
+++ b/sys/arch/sparc/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.48 2013/03/25 17:46:24 deraadt Exp $	*/
+/*	$OpenBSD: param.h,v 1.49 2013/03/26 05:04:10 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -85,8 +85,6 @@
 # define PAGE_SIZE	uvmexp.pagesize
 # define PAGE_MASK	uvmexp.pagemask
 #endif
-#define	PGSHIFT		PAGE_SHIFT		/* LOG2(PAGE_SIZE) */
-#define	PGOFSET		PAGE_MASK		/* byte offset into page */
 
 #define	KERNBASE	0xf8000000
 
@@ -95,6 +93,8 @@
 #define	KERNTEXTOFF	0xf8004000		/* start of kernel text */
 
 #define	NBPG		PAGE_SIZE		/* bytes/page */
+#define	PGSHIFT		PAGE_SHIFT		/* LOG2(PAGE_SIZE) */
+#define	PGOFSET		PAGE_MASK		/* byte offset into page */
 
 /*#define UPAGES	depends on machine model */
 #define	USPACE		8192			/* total size of u-area */
diff --git a/sys/arch/sparc64/include/param.h b/sys/arch/sparc64/include/param.h
index 7c8a30bbbf2..d90139c3fd3 100644
--- a/sys/arch/sparc64/include/param.h
+++ b/sys/arch/sparc64/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.38 2013/03/25 17:46:24 deraadt Exp $	*/
+/*	$OpenBSD: param.h,v 1.39 2013/03/26 05:04:10 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -73,8 +73,6 @@
 #define	PAGE_SHIFT	13
 #define	PAGE_SIZE	(1 << PAGE_SHIFT)
 #define	PAGE_MASK	(PAGE_SIZE - 1)
-#define	PGSHIFT		PAGE_SHIFT		/* LOG2(PAGE_SIZE) */
-#define	PGOFSET		PAGE_MASK		/* byte offset into page */
 
 /*
  * Here are all the magic kernel virtual addresses and how they're allocated.
@@ -130,6 +128,8 @@
 #define	CPUINFO_VA	(    EINTSTACK)
 
 #define	NBPG		PAGE_SIZE		/* bytes/page */
+#define	PGSHIFT		PAGE_SHIFT		/* LOG2(PAGE_SIZE) */
+#define	PGOFSET		PAGE_MASK		/* byte offset into page */
 
 #define	UPAGES		2			/* pages of u-area */
 #define	USPACE		(UPAGES * PAGE_SIZE)	/* total size of u-area */
diff --git a/sys/arch/vax/include/param.h b/sys/arch/vax/include/param.h
index bd4acb94b9f..5a8c1f2c508 100644
--- a/sys/arch/vax/include/param.h
+++ b/sys/arch/vax/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.39 2013/03/25 17:46:24 deraadt Exp $ */
+/*	$OpenBSD: param.h,v 1.40 2013/03/26 05:04:10 deraadt Exp $ */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -44,8 +44,6 @@
 #define	PAGE_SHIFT	12
 #define	PAGE_SIZE	(1 << PAGE_SHIFT)
 #define	PAGE_MASK	(PAGE_SIZE - 1)
-#define	PGSHIFT		PAGE_SHIFT		/* LOG2(PAGE_SIZE) */
-#define	PGOFSET		PAGE_MASK		/* byte offset into page */
 
 #define	VAX_PGSHIFT	9
 #define	VAX_NBPG	(1 << VAX_PGSHIFT)
@@ -57,6 +55,8 @@
 #ifdef _KERNEL
 
 #define	NBPG		PAGE_SIZE		/* bytes/page */
+#define	PGSHIFT		PAGE_SHIFT		/* LOG2(PAGE_SIZE) */
+#define	PGOFSET		PAGE_MASK		/* byte offset into page */
 
 #define	UPAGES		2			/* pages of u-area */
 #define	USPACE		(UPAGES * PAGE_SIZE)