From owner-freebsd-hackers  Sat Dec  6 17:13:14 1997
Return-Path: <owner-freebsd-hackers>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id RAA01915
          for hackers-outgoing; Sat, 6 Dec 1997 17:13:14 -0800 (PST)
          (envelope-from owner-freebsd-hackers)
Received: from elvis.vnet.net (elvis.vnet.net [166.82.1.5])
          by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id RAA01894
          for <freebsd-hackers@freefall.FreeBSD.org>; Sat, 6 Dec 1997 17:13:05 -0800 (PST)
          (envelope-from rivers@dignus.com)
Received: from ponds.dignus.com (ponds.vnet.net [166.82.177.48])
          by elvis.vnet.net (8.8.8/8.8.4) with ESMTP
	  id UAA00728 for <freebsd-hackers@freefall.cdrom.com>; Sat, 6 Dec 1997 20:12:36 -0500 (EST)
Received: from lakes.dignus.com (lakes [10.0.0.3])
	by ponds.dignus.com (8.8.5/8.8.5) with ESMTP id RAA00304
	for <freebsd-hackers@freefall.cdrom.com>; Sat, 6 Dec 1997 17:36:18 -0500 (EST)
Received: (from rivers@localhost) by lakes.dignus.com (8.8.7/8.6.9) id RAA02916 for freebsd-hackers@freefall.cdrom.com; Sat, 6 Dec 1997 17:23:36 -0500 (EST)
Date: Sat, 6 Dec 1997 17:23:36 -0500 (EST)
From: Thomas David Rivers <rivers@dignus.com>
Message-Id: <199712062223.RAA02916@lakes.dignus.com>
To: freebsd-hackers@freefall.FreeBSD.org
Subject: F00F patch problems for 2.2.5-RELEASE (incomplete patch.)
Sender: owner-freebsd-hackers@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk



Well -

 I noticed on the Web site the "official" F00F fix for 2.2.5
had been supplied.

 I got it downloaded, and applied it to my 2.2.5-RELEASE kernel source
tree... (with some questionable fuzz-factors and line offsets), only
to find it didn't work.  That is, the F00F_HACK wasn't enabled.

 For example, the patch to machdep.c has:

#if defined(I586_CPU) && !define(NO_F00F_HACK)

 which one would suppose to be fine.  

 But... the 2.2.5 release of machdep.c doesn't include "opt_cpu.h",
thus, I586_CPU isn't defined... so the F00F workaround doesn't get
compiled in... (perhaps somewhere after the 2.2.5-RELEASE cut, this
include was added?)


 trap.c suffers from this problem as well.

 
 The following diff to machdep.c and trap.c fixes the patch...

	- Dave Rivers -

*** machdep.c~	Sat Dec  6 17:07:23 1997
--- machdep.c	Sat Dec  6 17:10:33 1997
***************
*** 45,50 ****
--- 45,51 ----
  #include "opt_machdep.h"
  #include "opt_perfmon.h"
  #include "opt_userconfig.h"
+ #include "opt_cpu.h"
  
  #include <sys/param.h>
  #include <sys/systm.h>
*** trap.c~	Sat Dec  6 16:16:41 1997
--- trap.c	Sat Dec  6 17:11:03 1997
***************
*** 44,49 ****
--- 44,50 ----
  
  #include "opt_ktrace.h"
  #include "opt_ddb.h"
+ #include "opt_cpu.h"
  
  #include <sys/param.h>
  #include <sys/systm.h>