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/amd64/amd64/initcpu.c | |
| 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/amd64/amd64/initcpu.c')
| -rw-r--r-- | sys/amd64/amd64/initcpu.c | 7 |
1 files changed, 1 insertions, 6 deletions
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 |
