From 5a9c69e7af2b6111164e69bd7302b02b8e79a86d Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Sat, 28 Dec 1996 12:19:25 +0000
Subject: [PATCH] Disabled i586-optimized copyin and copyout again.  The fault
 handler is still broken - it doesn't restore the floating point state.

2.2-BETA users should disable it using npx0 flags 0x04 the same as
2.2-ALPHA users should have.
---
 sys/amd64/amd64/fpu.c | 4 +++-
 sys/amd64/isa/npx.c   | 4 +++-
 sys/i386/isa/npx.c    | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index db817468116d..b8147575dd6a 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.33 1996/11/15 20:27:14 bde Exp $
+ *	$Id: npx.c,v 1.34 1996/11/30 14:08:44 bde Exp $
  */
 
 #include "npx.h"
@@ -367,10 +367,12 @@ npxattach(dvp)
 		}
 		if (!(dvp->id_flags & NPX_DISABLE_I586_OPTIMIZED_BZERO))
 			bzero = i586_bzero;
+#ifdef notyet
 		if (!(dvp->id_flags & NPX_DISABLE_I586_OPTIMIZED_COPYIO)) {
 			copyin_vector = i586_copyin;
 			copyout_vector = i586_copyout;
 		}
+#endif
 	}
 #endif
 
diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c
index db817468116d..b8147575dd6a 100644
--- a/sys/amd64/isa/npx.c
+++ b/sys/amd64/isa/npx.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.33 1996/11/15 20:27:14 bde Exp $
+ *	$Id: npx.c,v 1.34 1996/11/30 14:08:44 bde Exp $
  */
 
 #include "npx.h"
@@ -367,10 +367,12 @@ npxattach(dvp)
 		}
 		if (!(dvp->id_flags & NPX_DISABLE_I586_OPTIMIZED_BZERO))
 			bzero = i586_bzero;
+#ifdef notyet
 		if (!(dvp->id_flags & NPX_DISABLE_I586_OPTIMIZED_COPYIO)) {
 			copyin_vector = i586_copyin;
 			copyout_vector = i586_copyout;
 		}
+#endif
 	}
 #endif
 
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index db817468116d..b8147575dd6a 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.33 1996/11/15 20:27:14 bde Exp $
+ *	$Id: npx.c,v 1.34 1996/11/30 14:08:44 bde Exp $
  */
 
 #include "npx.h"
@@ -367,10 +367,12 @@ npxattach(dvp)
 		}
 		if (!(dvp->id_flags & NPX_DISABLE_I586_OPTIMIZED_BZERO))
 			bzero = i586_bzero;
+#ifdef notyet
 		if (!(dvp->id_flags & NPX_DISABLE_I586_OPTIMIZED_COPYIO)) {
 			copyin_vector = i586_copyin;
 			copyout_vector = i586_copyout;
 		}
+#endif
 	}
 #endif