summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsef <sef@FreeBSD.org>1997-12-03 16:27:33 +0000
committersef <sef@FreeBSD.org>1997-12-03 16:27:33 +0000
commite32f8f106f64e8fa074aab9f0522cf943d1e59db (patch)
treea70d015e86b26fe1b5cd86391ac23af905ce86dd
parent4c9568e05af003a85ca40c896b5041fc8286221f (diff)
downloadFreeBSD-src-e32f8f106f64e8fa074aab9f0522cf943d1e59db.zip
FreeBSD-src-e32f8f106f64e8fa074aab9f0522cf943d1e59db.tar.gz
Make has_f00f_bug extern, and get rid of some unused code in the f00f
code. Submitted by: Mikael Karpberg & Cy Schubert
-rw-r--r--sys/amd64/amd64/machdep.c7
-rw-r--r--sys/i386/i386/machdep.c7
2 files changed, 4 insertions, 10 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 82ad9e5..986b16b 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
- * $Id: machdep.c,v 1.274 1997/11/24 18:35:11 bde Exp $
+ * $Id: machdep.c,v 1.275 1997/12/03 02:45:46 sef Exp $
*/
#include "apm.h"
@@ -868,7 +868,7 @@ u_int my_tr; /* which task register setting */
#ifndef NO_F00F_HACK
struct gate_descriptor *t_idt;
-int has_f00f_bug;
+extern int has_f00f_bug;
#endif
static struct i386tss dblfault_tss;
@@ -1548,8 +1548,6 @@ f00f_hack(void) {
struct region_descriptor r_idt;
unsigned char *tmp;
int i;
- vm_offset_t vp;
- unsigned *pte;
if (!has_f00f_bug)
return;
@@ -1568,7 +1566,6 @@ f00f_hack(void) {
bcopy(idt, t_idt, sizeof(idt));
r_idt.rd_base = (int)t_idt;
lidt(&r_idt);
- vp = trunc_page(t_idt);
if (vm_map_protect(kernel_map, tmp, tmp + PAGE_SIZE,
VM_PROT_READ, FALSE) != KERN_SUCCESS)
panic("vm_map_protect failed");
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 82ad9e5..986b16b 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
- * $Id: machdep.c,v 1.274 1997/11/24 18:35:11 bde Exp $
+ * $Id: machdep.c,v 1.275 1997/12/03 02:45:46 sef Exp $
*/
#include "apm.h"
@@ -868,7 +868,7 @@ u_int my_tr; /* which task register setting */
#ifndef NO_F00F_HACK
struct gate_descriptor *t_idt;
-int has_f00f_bug;
+extern int has_f00f_bug;
#endif
static struct i386tss dblfault_tss;
@@ -1548,8 +1548,6 @@ f00f_hack(void) {
struct region_descriptor r_idt;
unsigned char *tmp;
int i;
- vm_offset_t vp;
- unsigned *pte;
if (!has_f00f_bug)
return;
@@ -1568,7 +1566,6 @@ f00f_hack(void) {
bcopy(idt, t_idt, sizeof(idt));
r_idt.rd_base = (int)t_idt;
lidt(&r_idt);
- vp = trunc_page(t_idt);
if (vm_map_protect(kernel_map, tmp, tmp + PAGE_SIZE,
VM_PROT_READ, FALSE) != KERN_SUCCESS)
panic("vm_map_protect failed");
OpenPOWER on IntegriCloud