diff options
| author | wpaul <wpaul@FreeBSD.org> | 1995-04-13 04:55:35 +0000 |
|---|---|---|
| committer | wpaul <wpaul@FreeBSD.org> | 1995-04-13 04:55:35 +0000 |
| commit | 8eae6154a2fd9ad5d3a0ce3952f9986cf4bf9aa2 (patch) | |
| tree | 39e2b6a86a64ae89e5a2594e744537de0010139d /sys/amd64 | |
| parent | 02e9c53b9767e7c6778d1df7b1edf222683ac9bb (diff) | |
| download | FreeBSD-src-8eae6154a2fd9ad5d3a0ce3952f9986cf4bf9aa2.zip FreeBSD-src-8eae6154a2fd9ad5d3a0ce3952f9986cf4bf9aa2.tar.gz | |
This a subtle reminder to people that not everybody compiles their
kernels with 'options I586_CPU.'
The declaration for pentium_mhz is hidden inside an #ifdef I586_CPU,
but machdep.c refers to it whether I586_CPU is defined or not. This
temporary hack puts the offending code inside an #ifdef I586_CPU as
well so that a kernel without it will successfully compile.
I must emphasize the word 'temporary:' somebody needs to seriously
beat on the identifycpu() function with an #ifdef stick so that
I386_CPU, I486_CPU and I586_CPU will do the right things.
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/machdep.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 7e1129b..2aa0e14 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.116 1995/04/06 07:55:42 rgrimes Exp $ + * $Id: machdep.c,v 1.117 1995/04/12 20:47:28 wollman Exp $ */ #include "npx.h" @@ -466,6 +466,7 @@ identifycpu() break; case 0x480: strcat(cpu_model, "DX4"); break; +#ifdef I586_CPU case 0x510: if (pentium_mhz == 60) { strcat(cpu_model, "510\\60"); @@ -484,6 +485,7 @@ identifycpu() strcat(cpu_model,"735\\90 or 815\\100"); } break; +#endif } } } |
