summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>1997-05-08 09:18:11 +0000
committerkato <kato@FreeBSD.org>1997-05-08 09:18:11 +0000
commit561973a5ca7ca118552cd84b9acebc7990c26a88 (patch)
tree45903f31b0d5c179443d6793b45b09a53cb89fd1 /sys
parentcd7f26a2ed25009954be5fc15f7c0da4e5bada9f (diff)
downloadFreeBSD-src-561973a5ca7ca118552cd84b9acebc7990c26a88.zip
FreeBSD-src-561973a5ca7ca118552cd84b9acebc7990c26a88.tar.gz
Synchronize with sys/i386/conf/options.i386 revision 1.44.
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/options.pc989
-rw-r--r--sys/pc98/conf/options.pc989
2 files changed, 12 insertions, 6 deletions
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index 7e75751..3d568e7 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -1,4 +1,4 @@
-# $Id: options.pc98,v 1.22 1997/04/28 15:49:55 kato Exp $
+# $Id: options.pc98,v 1.23 1997/04/29 03:15:32 kato Exp $
BOUNCEPAGES opt_bounce.h
USER_LDT
MATH_EMULATE opt_math_emulate.h
@@ -28,8 +28,11 @@ PCVT_FREEBSD opt_pcvt.h
PCVT_SCANSET opt_pcvt.h
XSERVER opt_pcvt.h
-SMP opt_smp.h
-APIC_IO opt_smp.h
+# These two SMP options have dramatic implications all over the kernel
+SMP opt_global.h
+APIC_IO opt_global.h
+
+# Standard SMP options
NCPU opt_smp.h
NBUS opt_smp.h
NAPIC opt_smp.h
diff --git a/sys/pc98/conf/options.pc98 b/sys/pc98/conf/options.pc98
index 7e75751..3d568e7 100644
--- a/sys/pc98/conf/options.pc98
+++ b/sys/pc98/conf/options.pc98
@@ -1,4 +1,4 @@
-# $Id: options.pc98,v 1.22 1997/04/28 15:49:55 kato Exp $
+# $Id: options.pc98,v 1.23 1997/04/29 03:15:32 kato Exp $
BOUNCEPAGES opt_bounce.h
USER_LDT
MATH_EMULATE opt_math_emulate.h
@@ -28,8 +28,11 @@ PCVT_FREEBSD opt_pcvt.h
PCVT_SCANSET opt_pcvt.h
XSERVER opt_pcvt.h
-SMP opt_smp.h
-APIC_IO opt_smp.h
+# These two SMP options have dramatic implications all over the kernel
+SMP opt_global.h
+APIC_IO opt_global.h
+
+# Standard SMP options
NCPU opt_smp.h
NBUS opt_smp.h
NAPIC opt_smp.h
OpenPOWER on IntegriCloud