diff options
| author | Gordon Willem Klok <gwk@cvs.openbsd.org> | 2006-12-20 17:50:41 +0000 |
|---|---|---|
| committer | Gordon Willem Klok <gwk@cvs.openbsd.org> | 2006-12-20 17:50:41 +0000 |
| commit | e9bacb4e114afe21668eb3e0aeda327d7cd70ff9 (patch) | |
| tree | 50fbaba4fe1bc45223f750c24043c056faefa177 /sys/arch/i386/include | |
| parent | 6a8ea32b55849ca9ef871833c18cb2d82434a8c7 (diff) | |
"#ifdef is a tool of the weak!"
Rename pentium_mhz to cpuspeed which is consistant with amd64 making
shared ACPI code less nasty.
ok marco, deraadt
Diffstat (limited to 'sys/arch/i386/include')
| -rw-r--r-- | sys/arch/i386/include/cpu.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h index d6b43259c55..9cd4923d30f 100644 --- a/sys/arch/i386/include/cpu.h +++ b/sys/arch/i386/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.84 2006/12/12 23:14:27 dim Exp $ */ +/* $OpenBSD: cpu.h,v 1.85 2006/12/20 17:50:40 gwk Exp $ */ /* $NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $ */ /*- @@ -247,7 +247,7 @@ void calibrate_cyclecounter(void); extern u_quad_t pentium_base_tsc; #define CPU_CLOCKUPDATE() \ do { \ - if (pentium_mhz) { \ + if (cpuspeed) { \ __asm __volatile("cli\n" \ "rdtsc\n" \ : "=A" (pentium_base_tsc) \ @@ -311,7 +311,7 @@ extern const struct cpu_cpuid_nameclass i386_cpuid_cpus[]; extern int cpu_apmwarn; #if defined(I586_CPU) || defined(I686_CPU) -extern int pentium_mhz; +extern int cpuspeed; extern int bus_clock; #endif |