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

Expand some #ifdef's to fix I386_CPU compile.

Browse Source 
Reported by:	Andy Farkas <andyf@speednet.com.au>
This commit is contained in:
John Baldwin 2003-02-27 20:38:48 +00:00
parent 18a8dce9bc
commit 295435632d
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/identcpu.c
View File

@ -96,6 +96,7 @@ static char cpu_model[128];
SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD,
cpu_model, 0, "Machine model");
#if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU)
static char cpu_brand[48];
#define MAX_BRAND_INDEX 8
@ -111,6 +112,7 @@ static const char *cpu_brandtable[MAX_BRAND_INDEX + 1] = {
NULL,
"Intel Pentium 4"
};
#endif
static struct cpu_nameclass i386_cpus[] = {
{ "Intel 80286", CPUCLASS_286 }, /* CPU_286 */
@ -141,8 +143,8 @@ printcpuinfo(void)
{
#if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU)
u_int regs[4], i;
#endif
char *brand;
#endif
cpu_class = i386_cpus[cpu].cpu_class;
printf("CPU: ");

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

@ -96,6 +96,7 @@ static char cpu_model[128];
SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD,
cpu_model, 0, "Machine model");
#if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU)
static char cpu_brand[48];
#define MAX_BRAND_INDEX 8
@ -111,6 +112,7 @@ static const char *cpu_brandtable[MAX_BRAND_INDEX + 1] = {
NULL,
"Intel Pentium 4"
};
#endif
static struct cpu_nameclass i386_cpus[] = {
{ "Intel 80286", CPUCLASS_286 }, /* CPU_286 */
@ -141,8 +143,8 @@ printcpuinfo(void)
{
#if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU)
u_int regs[4], i;
#endif
char *brand;
#endif
cpu_class = i386_cpus[cpu].cpu_class;
printf("CPU: ");