diff options
| author | jkim <jkim@FreeBSD.org> | 2011-03-15 17:19:52 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2011-03-15 17:19:52 +0000 |
| commit | ad8ef5e4c74c5284ed975a5c90bc986ea4ed3933 (patch) | |
| tree | d87e7f881f4daa44164c406cd5648fc96c3d4144 /sys/contrib/altq/altq/altq_subr.c | |
| parent | d3440080b0bc9de31def1f395728bafd1bcb558f (diff) | |
| download | FreeBSD-src-ad8ef5e4c74c5284ed975a5c90bc986ea4ed3933.zip FreeBSD-src-ad8ef5e4c74c5284ed975a5c90bc986ea4ed3933.tar.gz | |
Deprecate tsc_present as the last of its real consumers finally disappeared.
Diffstat (limited to 'sys/contrib/altq/altq/altq_subr.c')
| -rw-r--r-- | sys/contrib/altq/altq/altq_subr.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/contrib/altq/altq/altq_subr.c b/sys/contrib/altq/altq/altq_subr.c index a58747d..524e752 100644 --- a/sys/contrib/altq/altq/altq_subr.c +++ b/sys/contrib/altq/altq/altq_subr.c @@ -78,10 +78,12 @@ #include <machine/clock.h> #endif #if defined(__amd64__) || defined(__i386__) -#include <machine/cpu.h> /* for cpu_feature or tsc_present */ #include <machine/cpufunc.h> /* for pentium tsc */ -#if defined(__NetBSD__) || defined(__OpenBSD__) #include <machine/specialreg.h> /* for CPUID_TSC */ +#ifdef __FreeBSD__ +#include <machine/md_var.h> /* for cpu_feature */ +#elif defined(__NetBSD__) || defined(__OpenBSD__) +#include <machine/cpu.h> /* for cpu_feature */ #endif #endif /* __amd64 || __i386__ */ @@ -927,7 +929,7 @@ init_machclk_setup(void) #if defined(__amd64__) || defined(__i386__) /* check if TSC is available */ #ifdef __FreeBSD__ - if (!tsc_present || tsc_freq == 0) + if ((cpu_feature & CPUID_TSC) == 0 || tsc_freq == 0) #else if ((cpu_feature & CPUID_TSC) == 0) #endif |
