From owner-freebsd-current  Tue Oct 23 10:57:26 2001
Delivered-To: freebsd-current@freebsd.org
Received: from mail12.speakeasy.net (mail12.speakeasy.net [216.254.0.212])
	by hub.freebsd.org (Postfix) with ESMTP id D3D7437B405
	for <current@FreeBSD.org>; Tue, 23 Oct 2001 10:57:18 -0700 (PDT)
Received: (qmail 91698 invoked from network); 23 Oct 2001 17:57:17 -0000
Received: from unknown (HELO laptop.baldwin.cx) ([64.81.54.73]) (envelope-sender <jhb@FreeBSD.org>)
          by mail12.speakeasy.net (qmail-ldap-1.03) with SMTP
          for <current@FreeBSD.org>; 23 Oct 2001 17:57:17 -0000
Message-ID: <XFMail.011023105718.jhb@FreeBSD.org>
X-Mailer: XFMail 1.4.0 on FreeBSD
X-Priority: 3 (Normal)
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
Date: Tue, 23 Oct 2001 10:57:18 -0700 (PDT)
From: John Baldwin <jhb@FreeBSD.org>
To: current@FreeBSD.org
Subject: Test tweak for F00F bug..
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-current.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-current>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-current>
X-Loop: FreeBSD.ORG

Anyone running -current on a true Pentium with the F00F bug that can verify
that this simple cleanup patch works?

http://www.freebsd.org/~jhb/patches/f00f.patch

Index: trap.c
===================================================================
RCS file: /usr/cvs/src/sys/i386/i386/trap.c,v
retrieving revision 1.204
diff -u -r1.204 trap.c
--- trap.c      11 Oct 2001 18:25:57 -0000      1.204
+++ trap.c      20 Oct 2001 02:25:09 -0000
@@ -214,11 +214,6 @@
        }
 
        eva = 0;
-
-#if defined(I586_CPU) && !defined(NO_F00F_HACK)
-restart:
-#endif
-
        type = frame.tf_trapno;
        code = frame.tf_err;
 
@@ -294,8 +289,9 @@
                                 * f00f hack workaround has triggered, treat
                                 * as illegal instruction not page fault.
                                 */
-                               frame.tf_trapno = T_PRIVINFLT;
-                               goto restart;
+                               ucode = T_PRIVINFLT;
+                               i = SIGILL;
+                               break;
                        }
 #endif
                        if (i == -1)

-- 

John Baldwin <jhb@FreeBSD.org> -- http://www.FreeBSD.org/~jhb/
PGP Key: http://www.baldwin.cx/~john/pgpkey.asc
"Power Users Use the Power to Serve!"  -  http://www.FreeBSD.org/

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message