From 673592ad96555bd07230131350eca1070a488dce Mon Sep 17 00:00:00 2001
From: kato <kato@FreeBSD.org>
Date: Sat, 30 Aug 1997 02:52:04 +0000
Subject: [PATCH] Move MACHINE_ARCH definition from <machine/param.h> to
 <machine/cpu.h>.

Submitted by:	Bruce Evans <bde@zeta.org.au>
---
 sys/amd64/include/cpu.h  | 13 ++++++++++++-
 sys/i386/include/cpu.h   | 13 ++++++++++++-
 sys/i386/include/param.h | 13 +------------
 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 12b7ef7d2c3f..730b5b365494 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_
@@ -47,6 +47,17 @@
 #include <machine/frame.h>
 #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 12b7ef7d2c3f..730b5b365494 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_
@@ -47,6 +47,17 @@
 #include <machine/frame.h>
 #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 031ff7407213..1eb4b34bfa91 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 cf9d403f44a7..3c04bd9f4b8a 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,