Stop the song and dance where alpha param.h tries to include the world.

"Why is this not commited yet?" says miod

3 files changed, 10 insertions, 16 deletions

diff --git a/sys/arch/alpha/include/alpha_cpu.h b/sys/arch/alpha/include/alpha_cpu.h
index 2ea5009662d..0cc5423bc4f 100644
--- a/sys/arch/alpha/include/alpha_cpu.h
+++ b/sys/arch/alpha/include/alpha_cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: alpha_cpu.h,v 1.10 2011/03/23 16:54:33 pirofti Exp $ */
+/* $OpenBSD: alpha_cpu.h,v 1.11 2012/06/26 01:59:47 deraadt Exp $ */
 /* $NetBSD: alpha_cpu.h,v 1.43 2001/12/18 04:18:22 thorpej Exp $ */
 
 /*
@@ -191,13 +191,8 @@ struct alpha_logout_area {
  *
  * Includes user and kernel space addresses and information,
  * page table entry definitions, etc.
- *
- * NOTE THAT THESE DEFINITIONS MAY CHANGE IN FUTURE ALPHA CPUS!
  */
 
-#define	ALPHA_PGSHIFT		13
-#define	ALPHA_PGBYTES		(1 << ALPHA_PGSHIFT)
-
 #define	ALPHA_USEG_BASE		0			/* virtual */
 #define	ALPHA_USEG_END		0x000003ffffffffff
 
diff --git a/sys/arch/alpha/include/cpu.h b/sys/arch/alpha/include/cpu.h
index d7580eb9894..b449f836859 100644
--- a/sys/arch/alpha/include/cpu.h
+++ b/sys/arch/alpha/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.43 2011/03/23 16:54:34 pirofti Exp $ */
+/* $OpenBSD: cpu.h,v 1.44 2012/06/26 01:59:47 deraadt Exp $ */
 /* $NetBSD: cpu.h,v 1.45 2000/08/21 02:03:12 thorpej Exp $ */
 
 /*-
@@ -92,12 +92,10 @@ typedef union alpha_t_float {
  * Exported definitions unique to Alpha cpu support.
  */
 
-#include <machine/alpha_cpu.h>
-#include <machine/frame.h>
-#include <machine/param.h>
-
 #ifdef _KERNEL
 
+#include <machine/alpha_cpu.h>
+#include <machine/frame.h>
 #include <machine/bus.h>
 #include <machine/intr.h>
 #include <sys/device.h>
diff --git a/sys/arch/alpha/include/param.h b/sys/arch/alpha/include/param.h
index db908ff515e..3956c8ff2e2 100644
--- a/sys/arch/alpha/include/param.h
+++ b/sys/arch/alpha/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.35 2011/09/08 03:40:32 guenther Exp $ */
+/* $OpenBSD: param.h,v 1.36 2012/06/26 01:59:47 deraadt Exp $ */
 /* $NetBSD: param.h,v 1.30 2000/06/09 16:03:04 thorpej Exp $ */
 
 /*
@@ -48,16 +48,17 @@
 #define	MACHINE_ARCH	"alpha"
 #define	MID_MACHINE	MID_ALPHA
 
-#include <machine/alpha_cpu.h>
+#ifdef _KERNEL
 #include <machine/cpu.h>
+#endif
 
 #define	ALIGNBYTES		_ALIGNBYTES
 #define	ALIGN(p)		_ALIGN(p)
 #define	ALIGNED_POINTER(p,t)	_ALIGNED_POINTER(p,t)
 
-#define	NBPG		(1 << ALPHA_PGSHIFT)		/* bytes/page */
-#define	PGOFSET		(NBPG-1)			/* byte off. into pg */
-#define	PGSHIFT		ALPHA_PGSHIFT			/* LOG2(NBPG) */
+#define	NBPG		(1 << 13)		/* bytes/page */
+#define	PGOFSET		(NBPG-1)		/* byte off. into pg */
+#define	PGSHIFT		13			/* LOG2(NBPG) */
 
 #define PAGE_SHIFT	13
 #define PAGE_SIZE	(1 << PAGE_SHIFT)