d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This a subtle reminder to people that not everybody compiles their

Browse Source 
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.
This commit is contained in:
wpaul 1995-04-13 04:55:35 +00:00
parent 02e9c53b97
commit 8eae6154a2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/amd64/amd64/machdep.c
View File

@ -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
}
}
}

4
sys/i386/i386/machdep.c
View File

@ -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
}
}
}