diff options
author | Miod Vallat <miod@cvs.openbsd.org> | 2004-08-02 08:35:01 +0000 |
---|---|---|
committer | Miod Vallat <miod@cvs.openbsd.org> | 2004-08-02 08:35:01 +0000 |
commit | 89158b44854f6931c20afcd86df3c402c54d04fa (patch) | |
tree | 9619ef5a3908bc00a23e9f106d12b561d3d68769 /sys/arch/m88k | |
parent | e2855b65eec8e646a5cc8b1f72d602529d8b4d19 (diff) |
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
Diffstat (limited to 'sys/arch/m88k')
-rw-r--r-- | sys/arch/m88k/include/cmmu.h | 12 | ||||
-rw-r--r-- | sys/arch/m88k/include/cpu.h | 9 | ||||
-rw-r--r-- | sys/arch/m88k/m88k/eh_common.S | 3 | ||||
-rw-r--r-- | sys/arch/m88k/m88k/pmap.c | 3 | ||||
-rw-r--r-- | sys/arch/m88k/m88k/vm_machdep.c | 3 |
5 files changed, 15 insertions, 15 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_ */ diff --git a/sys/arch/m88k/include/cpu.h b/sys/arch/m88k/include/cpu.h index fafb2ea1cff..8e34d692561 100644 --- a/sys/arch/m88k/include/cpu.h +++ b/sys/arch/m88k/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.3 2004/07/24 15:05:05 miod Exp $ */ +/* $OpenBSD: cpu.h,v 1.4 2004/08/02 08:34:59 miod Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * Copyright (c) 1992, 1993 @@ -54,9 +54,12 @@ #ifdef _KERNEL -#include <machine/psl.h> +#ifndef MAX_CPUS +#define MAX_CPUS 4 +#endif + #include <machine/pcb.h> -#include <machine/board.h> +#include <machine/psl.h> /* * definitions of cpu-dependent requirements diff --git a/sys/arch/m88k/m88k/eh_common.S b/sys/arch/m88k/m88k/eh_common.S index fff90932f74..7ab4a8053ff 100644 --- a/sys/arch/m88k/m88k/eh_common.S +++ b/sys/arch/m88k/m88k/eh_common.S @@ -1,4 +1,4 @@ -/* $OpenBSD: eh_common.S,v 1.3 2004/07/28 12:28:48 miod Exp $ */ +/* $OpenBSD: eh_common.S,v 1.4 2004/08/02 08:34:59 miod Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -207,7 +207,6 @@ #include <machine/param.h> #include <machine/asm.h> -#include <machine/board.h> #ifdef MVME188 #include <machine/m8820x.h> #endif diff --git a/sys/arch/m88k/m88k/pmap.c b/sys/arch/m88k/m88k/pmap.c index f3095b8aa5b..9e5e429bacf 100644 --- a/sys/arch/m88k/m88k/pmap.c +++ b/sys/arch/m88k/m88k/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.2 2004/07/26 11:08:20 miod Exp $ */ +/* $OpenBSD: pmap.c,v 1.3 2004/08/02 08:34:59 miod Exp $ */ /* * Copyright (c) 2001-2004, Miodrag Vallat * Copyright (c) 1998-2001 Steve Murphree, Jr. @@ -57,7 +57,6 @@ #include <uvm/uvm.h> #include <machine/asm_macro.h> -#include <machine/board.h> #include <machine/cmmu.h> #include <machine/cpu_number.h> #include <machine/pmap_table.h> diff --git a/sys/arch/m88k/m88k/vm_machdep.c b/sys/arch/m88k/m88k/vm_machdep.c index 5066f5a50aa..c028028b292 100644 --- a/sys/arch/m88k/m88k/vm_machdep.c +++ b/sys/arch/m88k/m88k/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.1 2004/07/23 15:34:03 miod Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.2 2004/08/02 08:35:00 miod Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. @@ -57,7 +57,6 @@ #include <uvm/uvm_extern.h> #include <machine/mmu.h> -#include <machine/board.h> #include <machine/cmmu.h> #include <machine/cpu.h> #include <machine/cpu_number.h> |