Kill option FAILSAFE.

PR:		i386/12187
Approved by:	bde

16 files changed, 25 insertions, 54 deletions

diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index a26d1d6..93e7270 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.24 1999/06/05 13:29:56 dfr Exp $
+#	$Id: GENERIC,v 1.25 1999/06/14 22:59:55 jb Exp $
 
 machine		"alpha"
 cpu		"EV4"
@@ -44,7 +44,6 @@ options		PROCFS			#Process filesystem
 options		"COMPAT_43"		#Compatible with BSD 4.3 [KEEP THIS!]
 options		SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
 options		UCONSOLE		#Allow users to grab the console
-options		FAILSAFE		#Be conservative
 
 # Platform chipsets
 controller	cia0
diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES
index a26d1d6..93e7270 100644
--- a/sys/alpha/conf/NOTES
+++ b/sys/alpha/conf/NOTES
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.24 1999/06/05 13:29:56 dfr Exp $
+#	$Id: GENERIC,v 1.25 1999/06/14 22:59:55 jb Exp $
 
 machine		"alpha"
 cpu		"EV4"
@@ -44,7 +44,6 @@ options		PROCFS			#Process filesystem
 options		"COMPAT_43"		#Compatible with BSD 4.3 [KEEP THIS!]
 options		SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
 options		UCONSOLE		#Allow users to grab the console
-options		FAILSAFE		#Be conservative
 
 # Platform chipsets
 controller	cia0
diff --git a/sys/alpha/conf/SIMOS b/sys/alpha/conf/SIMOS
index 528506c..1c690d5 100644
--- a/sys/alpha/conf/SIMOS
+++ b/sys/alpha/conf/SIMOS
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: SIMOS,v 1.2 1998/06/28 00:48:48 dfr Exp $
+#	$Id: SIMOS,v 1.3 1998/09/26 14:49:26 dfr Exp $
 
 machine		"alpha"
 cpu		"EV5"
@@ -32,7 +32,6 @@ options		PROCFS			#Process filesystem
 options		"COMPAT_43"		#Compatible with BSD 4.3 [KEEP THIS!]
 options		SCSI_DELAY=100		#Be pessimistic about Joe SCSI device
 options		UCONSOLE		#Allow users to grab the console
-options		FAILSAFE		#Be conservative
 
 config		kernel	root on da0
 
diff --git a/sys/amd64/amd64/initcpu.c b/sys/amd64/amd64/initcpu.c
index d64f4ee..a58caad 100644
--- a/sys/amd64/amd64/initcpu.c
+++ b/sys/amd64/amd64/initcpu.c
@@ -26,11 +26,10 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *		$Id: initcpu.c,v 1.16 1998/12/27 23:23:26 msmith Exp $
+ *		$Id: initcpu.c,v 1.17 1999/01/16 13:41:33 kato Exp $
  */
 
 #include "opt_cpu.h"
-#include "opt_failsafe.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -315,10 +314,8 @@ init_6x86(void)
 #ifdef CPU_CYRIX_NO_LOCK
 	write_cyrix_reg(CCR1, read_cyrix_reg(CCR1) | CCR1_NO_LOCK);
 #else
-#ifdef FAILSAFE
 	write_cyrix_reg(CCR1, read_cyrix_reg(CCR1) & ~CCR1_NO_LOCK);
 #endif
-#endif
 
 	/* Initialize CCR2. */
 #ifdef CPU_SUSP_HLT
@@ -398,10 +395,8 @@ init_6x86MX(void)
 #ifdef CPU_CYRIX_NO_LOCK
 	write_cyrix_reg(CCR1, read_cyrix_reg(CCR1) | CCR1_NO_LOCK);
 #else
-#ifdef FAILSAFE
 	write_cyrix_reg(CCR1, read_cyrix_reg(CCR1) & ~CCR1_NO_LOCK);
 #endif
-#endif
 
 	/* Initialize CCR2. */
 #ifdef CPU_SUSP_HLT
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 6665c25..933a0b9 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.171 1999/05/20 20:02:34 n_hibma Exp $
+#	$Id: GENERIC,v 1.172 1999/05/21 04:37:35 wpaul Exp $
 
 machine		i386
 cpu		I386_CPU
@@ -38,7 +38,6 @@ options		PROCFS			#Process filesystem
 options		COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
 options		SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
 options		UCONSOLE		#Allow users to grab the console
-options		FAILSAFE		#Be conservative
 options		USERCONFIG		#boot -c editor
 options		VISUAL_USERCONFIG	#visual boot -c editor
 
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
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 6665c25..933a0b9 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.171 1999/05/20 20:02:34 n_hibma Exp $
+#	$Id: GENERIC,v 1.172 1999/05/21 04:37:35 wpaul Exp $
 
 machine		i386
 cpu		I386_CPU
@@ -38,7 +38,6 @@ options		PROCFS			#Process filesystem
 options		COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
 options		SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
 options		UCONSOLE		#Allow users to grab the console
-options		FAILSAFE		#Be conservative
 options		USERCONFIG		#boot -c editor
 options		VISUAL_USERCONFIG	#visual boot -c editor
 
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index f4df5f5..bb02c28 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -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/i386/conf/NOTES b/sys/i386/conf/NOTES
index f4df5f5..bb02c28 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/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/i386/conf/options.i386 b/sys/i386/conf/options.i386
index 976bde5..c3aa0d9 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/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
diff --git a/sys/i386/i386/initcpu.c b/sys/i386/i386/initcpu.c
index d64f4ee..a58caad 100644
--- a/sys/i386/i386/initcpu.c
+++ b/sys/i386/i386/initcpu.c
@@ -26,11 +26,10 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *		$Id: initcpu.c,v 1.16 1998/12/27 23:23:26 msmith Exp $
+ *		$Id: initcpu.c,v 1.17 1999/01/16 13:41:33 kato Exp $
  */
 
 #include "opt_cpu.h"
-#include "opt_failsafe.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -315,10 +314,8 @@ init_6x86(void)
 #ifdef CPU_CYRIX_NO_LOCK
 	write_cyrix_reg(CCR1, read_cyrix_reg(CCR1) | CCR1_NO_LOCK);
 #else
-#ifdef FAILSAFE
 	write_cyrix_reg(CCR1, read_cyrix_reg(CCR1) & ~CCR1_NO_LOCK);
 #endif
-#endif
 
 	/* Initialize CCR2. */
 #ifdef CPU_SUSP_HLT
@@ -398,10 +395,8 @@ init_6x86MX(void)
 #ifdef CPU_CYRIX_NO_LOCK
 	write_cyrix_reg(CCR1, read_cyrix_reg(CCR1) | CCR1_NO_LOCK);
 #else
-#ifdef FAILSAFE
 	write_cyrix_reg(CCR1, read_cyrix_reg(CCR1) & ~CCR1_NO_LOCK);
 #endif
-#endif
 
 	/* Initialize CCR2. */
 #ifdef CPU_SUSP_HLT
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 1996d54..7014114 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC98,v 1.74 1999/04/25 05:59:02 kato Exp $
+#	$Id: GENERIC98,v 1.75 1999/05/10 09:00:28 kato Exp $
 
 # GENERIC98 -- Generic PC98 machine with WD/SCSI disks
 
@@ -44,7 +44,6 @@ options		EPSON_BOUNCEDMA		#use bounce buufer for 15-16M
 #options		EPSON_MEMWIN		#EPSON memory window support
 options		UCONSOLE		#Allow users to grab the console
 #options		LINE30
-options		FAILSAFE		#Be conservative
 options		USERCONFIG		#boot -c editor
 options		VISUAL_USERCONFIG	#visual boot -c editor
 
diff --git a/sys/pc98/conf/GENERIC98 b/sys/pc98/conf/GENERIC98
index 1996d54..7014114 100644
--- a/sys/pc98/conf/GENERIC98
+++ b/sys/pc98/conf/GENERIC98
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC98,v 1.74 1999/04/25 05:59:02 kato Exp $
+#	$Id: GENERIC98,v 1.75 1999/05/10 09:00:28 kato Exp $
 
 # GENERIC98 -- Generic PC98 machine with WD/SCSI disks
 
@@ -44,7 +44,6 @@ options		EPSON_BOUNCEDMA		#use bounce buufer for 15-16M
 #options		EPSON_MEMWIN		#EPSON memory window support
 options		UCONSOLE		#Allow users to grab the console
 #options		LINE30
-options		FAILSAFE		#Be conservative
 options		USERCONFIG		#boot -c editor
 options		VISUAL_USERCONFIG	#visual boot -c editor
 
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index 1e72679..bc74ede 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: ncr.c,v 1.147 1999/05/21 22:02:02 ken Exp $
+**  $Id: ncr.c,v 1.148 1999/05/26 23:01:53 gallatin Exp $
 **
 **  Device driver for the   NCR 53C8XX   PCI-SCSI-Controller Family.
 **
@@ -47,7 +47,6 @@
 #define NCR_GETCC_WITHMSG
 
 #if defined (__FreeBSD__) && defined(KERNEL)
-#include "opt_failsafe.h"
 #include "opt_ncr.h"
 #endif /* defined(KERNEL) */
 
@@ -1360,7 +1359,7 @@ static	void	ncr_attach	(pcici_t tag, int unit);
 
 #if !defined(lint)
 static const char ident[] =
-	"\n$Id: ncr.c,v 1.147 1999/05/21 22:02:02 ken Exp $\n";
+	"\n$Id: ncr.c,v 1.148 1999/05/26 23:01:53 gallatin Exp $\n";
 #endif
 
 static const u_long	ncr_version = NCR_VERSION	* 11