diff options
| author | alc <alc@FreeBSD.org> | 2002-04-27 18:13:35 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 2002-04-27 18:13:35 +0000 |
| commit | b4f776aff872676719459e2d59e04516ea8b745b (patch) | |
| tree | 04755d19ce4605f12c441b8be9a39f0b1f99240c | |
| parent | 5feddc83ac40ce927266cfdb82652c2d81c17cad (diff) | |
| download | FreeBSD-src-b4f776aff872676719459e2d59e04516ea8b745b.zip FreeBSD-src-b4f776aff872676719459e2d59e04516ea8b745b.tar.gz | |
For what it's worth, fix the compilation of an I386_CPU-only kernel
now that certain warnings are fatal.
| -rw-r--r-- | sys/amd64/amd64/identcpu.c | 9 | ||||
| -rw-r--r-- | sys/i386/i386/identcpu.c | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c index 6aa0967..47d10ff 100644 --- a/sys/amd64/amd64/identcpu.c +++ b/sys/amd64/amd64/identcpu.c @@ -76,7 +76,9 @@ void enable_K6_2_wt_alloc(void); void panicifcpuunsupported(void); static void identifycyrix(void); +#if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU) static void print_AMD_features(u_int *regs); +#endif static void print_AMD_info(u_int amd_maxregs); static void print_AMD_assoc(int i); static void print_transmeta_info(void); @@ -119,7 +121,10 @@ int has_f00f_bug = 0; void printcpuinfo(void) { - u_int regs[4], nreg = 0; +#if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU) + u_int regs[4]; +#endif + u_int nreg = 0; cpu_class = i386_cpus[cpu].cpu_class; printf("CPU: "); strncpy(cpu_model, i386_cpus[cpu].cpu_name, sizeof cpu_model); @@ -980,6 +985,7 @@ print_AMD_info(u_int amd_maxregs) } } +#if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU) static void print_AMD_features(u_int *regs) { @@ -1024,6 +1030,7 @@ print_AMD_features(u_int *regs) "\0403DNow!" ); } +#endif /* * Transmeta Crusoe LongRun Support by Tamotsu Hattori. diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c index 6aa0967..47d10ff 100644 --- a/sys/i386/i386/identcpu.c +++ b/sys/i386/i386/identcpu.c @@ -76,7 +76,9 @@ void enable_K6_2_wt_alloc(void); void panicifcpuunsupported(void); static void identifycyrix(void); +#if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU) static void print_AMD_features(u_int *regs); +#endif static void print_AMD_info(u_int amd_maxregs); static void print_AMD_assoc(int i); static void print_transmeta_info(void); @@ -119,7 +121,10 @@ int has_f00f_bug = 0; void printcpuinfo(void) { - u_int regs[4], nreg = 0; +#if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU) + u_int regs[4]; +#endif + u_int nreg = 0; cpu_class = i386_cpus[cpu].cpu_class; printf("CPU: "); strncpy(cpu_model, i386_cpus[cpu].cpu_name, sizeof cpu_model); @@ -980,6 +985,7 @@ print_AMD_info(u_int amd_maxregs) } } +#if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU) static void print_AMD_features(u_int *regs) { @@ -1024,6 +1030,7 @@ print_AMD_features(u_int *regs) "\0403DNow!" ); } +#endif /* * Transmeta Crusoe LongRun Support by Tamotsu Hattori. |
