summaryrefslogtreecommitdiff
path: root/sys/altq
diff options
context:
space:
mode:
authorGordon Willem Klok <gwk@cvs.openbsd.org>2006-12-20 17:50:41 +0000
committerGordon Willem Klok <gwk@cvs.openbsd.org>2006-12-20 17:50:41 +0000
commite9bacb4e114afe21668eb3e0aeda327d7cd70ff9 (patch)
tree50fbaba4fe1bc45223f750c24043c056faefa177 /sys/altq
parent6a8ea32b55849ca9ef871833c18cb2d82434a8c7 (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/altq')
-rw-r--r--sys/altq/altq_subr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/altq/altq_subr.c b/sys/altq/altq_subr.c
index 098d8851af7..203e00557b7 100644
--- a/sys/altq/altq_subr.c
+++ b/sys/altq/altq_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: altq_subr.c,v 1.20 2006/03/04 22:40:15 brad Exp $ */
+/* $OpenBSD: altq_subr.c,v 1.21 2006/12/20 17:50:40 gwk Exp $ */
/* $KAME: altq_subr.c,v 1.11 2002/01/11 08:11:49 kjc Exp $ */
/*
@@ -776,7 +776,7 @@ init_machclk(void)
*/
#if defined(__i386__) && (defined(I586_CPU) || defined(I686_CPU))
/* XXX - this will break down with variable cpu frequency. */
- machclk_freq = pentium_mhz * 1000000;
+ machclk_freq = cpuspeed * 1000000;
#endif
#if defined(__alpha__)
machclk_freq = (u_int32_t)(cycles_per_usec * 1000000);