summaryrefslogtreecommitdiffstats
path: root/sys/i386
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1997-08-31 22:43:46 +0000
committerbde <bde@FreeBSD.org>1997-08-31 22:43:46 +0000
commitb217a31a96f18aecebfa079789e822952e9da3a8 (patch)
treee7a04f90320fe42b1bd99a7c1af8918049768f51 /sys/i386
parentbca1963c9bbc861bc35eff4a09e461e4f0f1c633 (diff)
downloadFreeBSD-src-b217a31a96f18aecebfa079789e822952e9da3a8.zip
FreeBSD-src-b217a31a96f18aecebfa079789e822952e9da3a8.tar.gz
Put I*86_CPU options in opt_global.h and don't #include "opt_cpu.h"
centrally.
Diffstat (limited to 'sys/i386')
-rw-r--r--sys/i386/conf/options.i38612
-rw-r--r--sys/i386/include/endian.h6
2 files changed, 8 insertions, 10 deletions
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index 5c28b4e..1cf121e 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,4 +1,4 @@
-# $Id: options.i386,v 1.54 1997/08/02 05:20:14 msmith Exp $
+# $Id: options.i386,v 1.55 1997/08/09 00:19:39 dyson Exp $
BOUNCEPAGES opt_bounce.h
USER_LDT
@@ -65,10 +65,12 @@ CPU_SUSP_HLT opt_cpu.h
CPU_UPGRADE_HW_CACHE opt_cpu.h
CYRIX_CACHE_WORKS opt_cpu.h
CYRIX_CACHE_REALLY_WORKS opt_cpu.h
-I386_CPU opt_cpu.h
-I486_CPU opt_cpu.h
-I586_CPU opt_cpu.h
-I686_CPU opt_cpu.h
+
+# The CPU type affects the endian conversion functions all over the kernel.
+I386_CPU opt_global.h
+I486_CPU opt_global.h
+I586_CPU opt_global.h
+I686_CPU opt_global.h
SC_SPLASH_SCREEN opt_syscons.h
MAXCONS opt_syscons.h
diff --git a/sys/i386/include/endian.h b/sys/i386/include/endian.h
index da56176..63971e5 100644
--- a/sys/i386/include/endian.h
+++ b/sys/i386/include/endian.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)endian.h 7.8 (Berkeley) 4/3/91
- * $Id: endian.h,v 1.14 1997/03/17 00:51:51 nate Exp $
+ * $Id: endian.h,v 1.15 1997/04/20 11:44:32 bde Exp $
*/
#ifndef _MACHINE_ENDIAN_H_
@@ -57,10 +57,6 @@
#ifndef KERNEL
#include <sys/cdefs.h>
-#else
-#ifndef ACTUALLY_LKM_NOT_KERNEL
-#include "opt_cpu.h"
-#endif
#endif
__BEGIN_DECLS
OpenPOWER on IntegriCloud