diff options
| author | jkh <jkh@FreeBSD.org> | 1997-12-04 14:35:40 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1997-12-04 14:35:40 +0000 |
| commit | 5409c159ea432deceba7ecf87a34df0237211e01 (patch) | |
| tree | ca5afe6564060c501161e39f79f77986d9f5c524 /sys/amd64/amd64/trap.c | |
| parent | b81e85c06524702f6dc99841256a714100d3797a (diff) | |
| download | FreeBSD-src-5409c159ea432deceba7ecf87a34df0237211e01.zip FreeBSD-src-5409c159ea432deceba7ecf87a34df0237211e01.tar.gz | |
After consultation with David, change
#ifndef NO_F00F_HACK
to
#if defined(I586_CPU) && !defined(NO_F00F_HACK)
Diffstat (limited to 'sys/amd64/amd64/trap.c')
| -rw-r--r-- | sys/amd64/amd64/trap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 9bebd7e..e8a8ea0 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.115 1997/11/24 13:25:37 bde Exp $ + * $Id: trap.c,v 1.116 1997/12/03 02:45:50 sef Exp $ */ /* @@ -142,7 +142,7 @@ static char *trap_msg[] = { static void userret __P((struct proc *p, struct trapframe *frame, u_quad_t oticks)); -#ifndef NO_F00F_HACK +#if defined(I586_CPU) && !defined(NO_F00F_HACK) extern struct gate_descriptor *t_idt; extern int has_f00f_bug; #endif @@ -216,7 +216,7 @@ trap(frame) u_long eva; #endif -#ifndef NO_F00F_HACK +#if defined(I586_CPU) && !defined(NO_F00F_HACK) restart: #endif type = frame.tf_trapno; @@ -284,7 +284,7 @@ restart: i = trap_pfault(&frame, TRUE); if (i == -1) return; -#ifndef NO_F00F_HACK +#if defined(I586_CPU) && !defined(NO_F00F_HACK) if (i == -2) goto restart; #endif @@ -660,7 +660,7 @@ trap_pfault(frame, usermode) * treat it is as an illegal instruction, and not a page * fault. */ -#ifndef NO_F00F_HACK +#if defined(I586_CPU) && !defined(NO_F00F_HACK) if ((eva == (unsigned int)&t_idt[6]) && has_f00f_bug) { frame->tf_trapno = T_PRIVINFLT; return -2; |
