diff options
| author | des <des@FreeBSD.org> | 1999-06-15 13:14:56 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 1999-06-15 13:14:56 +0000 |
| commit | 5d9e5afb2b4dd83a193e8001407934591c8c8053 (patch) | |
| tree | d40eb182006d7971204496bd2f26b3918ebfa7a7 /sys/conf | |
| parent | dc3c0e0e206904bffcfa4f7e1d8e7dce1c09f447 (diff) | |
| download | FreeBSD-src-5d9e5afb2b4dd83a193e8001407934591c8c8053.zip FreeBSD-src-5d9e5afb2b4dd83a193e8001407934591c8c8053.tar.gz | |
Kill option FAILSAFE.
PR: i386/12187
Approved by: bde
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/NOTES | 10 | ||||
| -rw-r--r-- | sys/conf/options | 3 | ||||
| -rw-r--r-- | sys/conf/options.i386 | 3 |
3 files changed, 6 insertions, 10 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index f4df5f5..bb02c28 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.604 1999/05/28 10:27:22 roger Exp $ +# $Id: LINT,v 1.605 1999/06/01 18:18:36 jlemon Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -56,10 +56,6 @@ maxusers 10 options MAXDSIZ="(256*1024*1024)" options DFLDSIZ="(256*1024*1024)" -# When this is set, be extra conservative in various parts of the kernel -# and choose functionality over speed (on the widest variety of systems). -options FAILSAFE - # Options for the VM subsystem #options PQ_NOOPT # No coloring options PQ_LARGECACHE # color for 512k/16k cache @@ -144,8 +140,8 @@ cpu I686_CPU # aka Pentium Pro(tm) # mapped mode. Default is 2-way set associative mode. # # CPU_CYRIX_NO_LOCK enables weak locking for the entire address space -# of Cyrix 6x86 and 6x86MX CPUs. If this option is not set and -# FAILESAFE is defined, NO_LOCK bit of CCR1 is cleared. (NOTE 3) +# of Cyrix 6x86 and 6x86MX CPUs by setting the NO_LOCK bit of CCR1. +# Otherwise, the NO_LOCK bit of CCR1 is cleared. (NOTE 3) # # CPU_DISABLE_5X86_LSSER disables load store serialize (i.e. enables # reorder). This option should not be used if you use memory mapped diff --git a/sys/conf/options b/sys/conf/options index 63e95ad..3932c71 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -1,4 +1,4 @@ -# $Id: options,v 1.140 1999/05/28 09:55:59 roger Exp $ +# $Id: options,v 1.141 1999/06/05 13:57:07 dfr Exp $ # # On the handling of kernel options # @@ -52,7 +52,6 @@ DDB DDB_UNATTENDED opt_ddb.h GDB_REMOTE_CHAT opt_ddb.h DEVFS -FAILSAFE HW_WDOG KTRACE MD5 diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 976bde5..c3aa0d9 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.115 1999/06/01 18:18:39 jlemon Exp $ +# $Id: options.i386,v 1.116 1999/06/06 22:45:04 steve Exp $ DISABLE_PSE IDE_DELAY @@ -43,6 +43,7 @@ NO_F00F_HACK opt_cpu.h CPU_BLUELIGHTNING_FPU_OP_CACHE opt_cpu.h CPU_BLUELIGHTNING_3X opt_cpu.h CPU_BTB_EN opt_cpu.h +CPU_CYRIX_NO_LOCK opt_cpu.h CPU_DIRECT_MAPPED_CACHE opt_cpu.h CPU_DISABLE_5X86_LSSER opt_cpu.h CPU_FASTER_5X86_FPU opt_cpu.h |
