summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>1998-12-21 09:58:37 +0000
committerkato <kato@FreeBSD.org>1998-12-21 09:58:37 +0000
commit14f77a8caec264ab971a6457f34b259e354d4e8e (patch)
tree693a891e197705c8ad238c5d64723b9a94f7a447
parent8dbdacacefe8acb651af05ff3420ad548bc2c851 (diff)
downloadFreeBSD-src-14f77a8caec264ab971a6457f34b259e354d4e8e.zip
FreeBSD-src-14f77a8caec264ab971a6457f34b259e354d4e8e.tar.gz
Sync with sys/i386/conf/options.i386 revision 1.96.
-rw-r--r--sys/conf/options.pc989
-rw-r--r--sys/pc98/conf/options.pc989
2 files changed, 4 insertions, 14 deletions
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index 41ae52b..ebc8110 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -1,4 +1,4 @@
-# $Id: options.pc98,v 1.73 1998/12/05 09:20:53 kato Exp $
+# $Id: options.pc98,v 1.74 1998/12/14 08:52:20 kato Exp $
DISABLE_PSE
IDE_DELAY
@@ -32,13 +32,8 @@ I586_PMC_GUPROF opt_i586_guprof.h
WLCACHE opt_wavelan.h
WLDEBUG opt_wavelan.h
-# These two SMP options have dramatic implications all over the kernel
-SMP opt_global.h
+# i386 SMP options
APIC_IO opt_global.h
-
-# Standard SMP options
-NCPU opt_smp.h
-NBUS opt_smp.h
NAPIC opt_smp.h
NINTR opt_smp.h
diff --git a/sys/pc98/conf/options.pc98 b/sys/pc98/conf/options.pc98
index 41ae52b..ebc8110 100644
--- a/sys/pc98/conf/options.pc98
+++ b/sys/pc98/conf/options.pc98
@@ -1,4 +1,4 @@
-# $Id: options.pc98,v 1.73 1998/12/05 09:20:53 kato Exp $
+# $Id: options.pc98,v 1.74 1998/12/14 08:52:20 kato Exp $
DISABLE_PSE
IDE_DELAY
@@ -32,13 +32,8 @@ I586_PMC_GUPROF opt_i586_guprof.h
WLCACHE opt_wavelan.h
WLDEBUG opt_wavelan.h
-# These two SMP options have dramatic implications all over the kernel
-SMP opt_global.h
+# i386 SMP options
APIC_IO opt_global.h
-
-# Standard SMP options
-NCPU opt_smp.h
-NBUS opt_smp.h
NAPIC opt_smp.h
NINTR opt_smp.h
OpenPOWER on IntegriCloud