Initiate deorbit burn sequence for 80386 support in FreeBSD: Remove

80386 (I386_CPU) support from the kernel.

4 files changed, 2 insertions, 14 deletions

diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 801ae1c..af08717 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -19,7 +19,6 @@
 # $FreeBSD$
 
 machine		pc98
-#cpu		I386_CPU		# Do not enable with other cpu types
 cpu		I486_CPU
 cpu		I586_CPU
 cpu		I686_CPU
diff --git a/sys/pc98/conf/NOTES b/sys/pc98/conf/NOTES
index 1345cc7..91c03cb 100644
--- a/sys/pc98/conf/NOTES
+++ b/sys/pc98/conf/NOTES
@@ -30,8 +30,6 @@ profile         2
 #
 # Notes:
 #
-# Be sure to disable 'cpu I386_CPU' for SMP kernels.
-#
 # By default, mixed mode is used to route IRQ0 from the AT timer via
 # the 8259A master PIC through the ExtINT pin on the first I/O APIC.
 # This can be disabled via the NO_MIXED_MODE option.  In that case,
@@ -55,10 +53,7 @@ options 	NO_MIXED_MODE		# Disable use of mixed mode
 # You must specify at least one CPU (the one you intend to run on);
 # deleting the specification for CPUs you don't need to use may make
 # parts of the system run faster.
-# I386_CPU is mutually exclusive with the other CPU types.
-# I386_CPU is deprecated and will be removed in 6.0-RELEASE.
 #
-#cpu		I386_CPU
 cpu		I486_CPU
 cpu		I586_CPU		# aka Pentium(tm)
 cpu		I686_CPU		# aka Pentium Pro(tm)
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c
index 83abbb3..5296ef5 100644
--- a/sys/pc98/i386/machdep.c
+++ b/sys/pc98/i386/machdep.c
@@ -1194,10 +1194,7 @@ cpu_setregs(void)
 	 * CR0_MP, CR0_NE and CR0_TS are also set by npx_probe() for the
 	 * BSP.  See the comments there about why we set them.
 	 */
-	cr0 |= CR0_MP | CR0_NE | CR0_TS;
-#ifndef I386_CPU
-	cr0 |= CR0_WP | CR0_AM;
-#endif
+	cr0 |= CR0_MP | CR0_NE | CR0_TS | CR0_WP | CR0_AM;
 	load_cr0(cr0);
 	load_gs(_udatasel);
 }
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index 83abbb3..5296ef5 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c
@@ -1194,10 +1194,7 @@ cpu_setregs(void)
 	 * CR0_MP, CR0_NE and CR0_TS are also set by npx_probe() for the
 	 * BSP.  See the comments there about why we set them.
 	 */
-	cr0 |= CR0_MP | CR0_NE | CR0_TS;
-#ifndef I386_CPU
-	cr0 |= CR0_WP | CR0_AM;
-#endif
+	cr0 |= CR0_MP | CR0_NE | CR0_TS | CR0_WP | CR0_AM;
 	load_cr0(cr0);
 	load_gs(_udatasel);
 }