diff options
| author | kato <kato@FreeBSD.org> | 1997-08-30 02:52:04 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1997-08-30 02:52:04 +0000 |
| commit | cca63e4f094182ea869d9882624d193900487f17 (patch) | |
| tree | dfc2d88ee72ac3d8e548d164597c076fa833e600 | |
| parent | 09489fa1b7b34378a6a036ea8f2526fe21469e65 (diff) | |
| download | FreeBSD-src-cca63e4f094182ea869d9882624d193900487f17.zip FreeBSD-src-cca63e4f094182ea869d9882624d193900487f17.tar.gz | |
Move MACHINE_ARCH definition from <machine/param.h> to <machine/cpu.h>.
Submitted by: Bruce Evans <bde@zeta.org.au>
| -rw-r--r-- | sys/amd64/include/cpu.h | 13 | ||||
| -rw-r--r-- | sys/i386/include/cpu.h | 13 | ||||
| -rw-r--r-- | sys/i386/include/param.h | 13 | ||||
| -rw-r--r-- | sys/kern/kern_mib.c | 4 |
4 files changed, 28 insertions, 15 deletions
diff --git a/sys/amd64/include/cpu.h b/sys/amd64/include/cpu.h index 12b7ef7..730b5b3 100644 --- a/sys/amd64/include/cpu.h +++ b/sys/amd64/include/cpu.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 - * $Id: cpu.h,v 1.31 1997/08/18 06:58:29 charnier Exp $ + * $Id: cpu.h,v 1.32 1997/08/21 06:32:48 charnier Exp $ */ #ifndef _MACHINE_CPU_H_ @@ -48,6 +48,17 @@ #include <machine/segments.h> /* + * Architecture dependent constant for i386 based machines. + */ +#ifdef PC98 +/* NEC PC-9801/9821 series and compatibles. */ +#define MACHINE_ARCH "pc-98" +#else +/* IBM-PC compatibles. */ +#define MACHINE_ARCH "ibm-pc" +#endif + +/* * definitions of cpu-dependent requirements * referenced in generic code */ diff --git a/sys/i386/include/cpu.h b/sys/i386/include/cpu.h index 12b7ef7..730b5b3 100644 --- a/sys/i386/include/cpu.h +++ b/sys/i386/include/cpu.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 - * $Id: cpu.h,v 1.31 1997/08/18 06:58:29 charnier Exp $ + * $Id: cpu.h,v 1.32 1997/08/21 06:32:48 charnier Exp $ */ #ifndef _MACHINE_CPU_H_ @@ -48,6 +48,17 @@ #include <machine/segments.h> /* + * Architecture dependent constant for i386 based machines. + */ +#ifdef PC98 +/* NEC PC-9801/9821 series and compatibles. */ +#define MACHINE_ARCH "pc-98" +#else +/* IBM-PC compatibles. */ +#define MACHINE_ARCH "ibm-pc" +#endif + +/* * definitions of cpu-dependent requirements * referenced in generic code */ diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h index 031ff74..1eb4b34 100644 --- a/sys/i386/include/param.h +++ b/sys/i386/include/param.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)param.h 5.8 (Berkeley) 6/28/91 - * $Id: param.h,v 1.38 1997/08/29 09:02:40 kato Exp $ + * $Id: param.h,v 1.39 1997/08/29 11:01:14 kato Exp $ */ #ifndef _MACHINE_PARAM_H_ @@ -52,17 +52,6 @@ #endif #define MID_MACHINE MID_I386 -/* - * Architecture dependent constant for i386 based machines. - */ -#ifdef PC98 -/* NEC PC-9801/9821 series and compatibles. */ -#define MACHINE_ARCH "pc-98" -#else -/* IBM-PC compatibles. */ -#define MACHINE_ARCH "ibm-pc" -#endif - #ifndef LOCORE /* diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c index cf9d403..3c04bd9 100644 --- a/sys/kern/kern_mib.c +++ b/sys/kern/kern_mib.c @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)kern_sysctl.c 8.4 (Berkeley) 4/14/94 - * $Id: kern_mib.c,v 1.9 1997/06/25 07:31:47 joerg Exp $ + * $Id: kern_mib.c,v 1.10 1997/08/29 09:03:02 kato Exp $ */ #include <sys/param.h> @@ -47,6 +47,8 @@ #include <sys/proc.h> #include <sys/unistd.h> +#include <machine/cpu.h> + SYSCTL_NODE(, 0, sysctl, CTLFLAG_RW, 0, "Sysctl internal magic"); SYSCTL_NODE(, CTL_KERN, kern, CTLFLAG_RW, 0, |
