diff options
| author | jkim <jkim@FreeBSD.org> | 2011-03-10 20:02:58 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2011-03-10 20:02:58 +0000 |
| commit | 98d68ca74180ecc5c33c021c3a2662b4465e1e09 (patch) | |
| tree | d3e4a7627440d02978a01253e4de46f2eb1bae99 /sys/contrib | |
| parent | faa7c47cee548849c5160cbc1e2ef218fc3bf3b3 (diff) | |
| download | FreeBSD-src-98d68ca74180ecc5c33c021c3a2662b4465e1e09.zip FreeBSD-src-98d68ca74180ecc5c33c021c3a2662b4465e1e09.tar.gz | |
Deprecate rarely used tsc_is_broken. Instead, we zero out tsc_freq because
it is almost always used with tsc_freq any way.
Diffstat (limited to 'sys/contrib')
| -rw-r--r-- | sys/contrib/altq/altq/altq_subr.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/contrib/altq/altq/altq_subr.c b/sys/contrib/altq/altq/altq_subr.c index e5b86f8..7d2fc77 100644 --- a/sys/contrib/altq/altq/altq_subr.c +++ b/sys/contrib/altq/altq/altq_subr.c @@ -79,10 +79,8 @@ #endif #if defined(__amd64__) || defined(__i386__) #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__ */ @@ -928,8 +926,11 @@ init_machclk_setup(void) #endif #if defined(__amd64__) || defined(__i386__) /* check if TSC is available */ - if (machclk_usepcc == 1 && ((cpu_feature & CPUID_TSC) == 0 || - tsc_is_broken)) +#ifdef __FreeBSD__ + if (tsc_freq == 0) +#else + if ((cpu_feature & CPUID_TSC) == 0) +#endif machclk_usepcc = 0; #endif } |
