More include files cleaning:

- move MAX_CPUS constant to <machine/cpu.h>
- do not include <machine/board.h> unless needed. In fact, remove this file
  entirely on mvme88k, and include <machine/mvme*.h> on a
  compiling-for-this-board basis
- keep MAX_CMMUS constant private to the m8820x code

1 files changed, 6 insertions, 6 deletions

diff --git a/sys/arch/m88k/include/cmmu.h b/sys/arch/m88k/include/cmmu.h
index d9bce283e64..72da0e1d2a4 100644
--- a/sys/arch/m88k/include/cmmu.h
+++ b/sys/arch/m88k/include/cmmu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmmu.h,v 1.2 2004/05/07 18:06:39 miod Exp $ */
+/*	$OpenBSD: cmmu.h,v 1.3 2004/08/02 08:34:59 miod Exp $ */
 /*
  * Mach Operating System
  * Copyright (c) 1993-1992 Carnegie Mellon University
@@ -25,12 +25,12 @@
  * the rights to redistribute these changes.
  */
 
-#ifndef	_MACHINE_CMMU_H_
-#define	_MACHINE_CMMU_H_
+#ifndef	_M88K_CMMU_H_
+#define	_M88K_CMMU_H_
 
 #include <machine/mmu.h>
 
-#ifndef	_LOCORE
+#if defined(_KERNEL) && !defined(_LOCORE)
 /*
  * Prototypes and stuff for cmmu.c.
  */
@@ -99,6 +99,6 @@ extern struct cmmu_p *cmmu;
 #define	cmmu_show_translation(a, b, c, d)	(cmmu->cmmu_show_translation_func)(a, b, c, d)
 #define show_apr(ap)		(cmmu->show_apr_func)(ap)
 
-#endif	/* _LOCORE */
+#endif	/* _KERNEL && !_LOCORE */
 
-#endif	/* _MACHINE_CMMU_H_ */
+#endif	/* _M88K_CMMU_H_ */