diff options
| author | jkim <jkim@FreeBSD.org> | 2011-03-10 18:58:40 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2011-03-10 18:58:40 +0000 |
| commit | aeb17da5dc544bf4e37d8c57e83a0c2b1ccc4846 (patch) | |
| tree | 3bf8e91a787b8e13921512666372a3ffbfbf93c0 /sys/contrib/altq | |
| parent | d695e3805740dd9325a406f71402ce103e5d4067 (diff) | |
| download | FreeBSD-src-aeb17da5dc544bf4e37d8c57e83a0c2b1ccc4846.zip FreeBSD-src-aeb17da5dc544bf4e37d8c57e83a0c2b1ccc4846.tar.gz | |
Consistently add TSC support for amd64.
Diffstat (limited to 'sys/contrib/altq')
| -rw-r--r-- | sys/contrib/altq/altq/altq_subr.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/contrib/altq/altq/altq_subr.c b/sys/contrib/altq/altq/altq_subr.c index 9db095b..8073013 100644 --- a/sys/contrib/altq/altq/altq_subr.c +++ b/sys/contrib/altq/altq/altq_subr.c @@ -77,7 +77,7 @@ #include <sys/eventhandler.h> #include <machine/clock.h> #endif -#if defined(__i386__) +#if defined(__amd64__) || defined(__i386__) #include <machine/cpufunc.h> /* for pentium tsc */ #include <machine/specialreg.h> /* for CPUID_TSC */ #ifdef __FreeBSD__ @@ -85,7 +85,7 @@ #elif defined(__NetBSD__) || defined(__OpenBSD__) #include <machine/cpu.h> /* for cpu_feature */ #endif -#endif /* __i386__ */ +#endif /* __amd64 || __i386__ */ /* * internal function prototypes @@ -938,7 +938,8 @@ init_machclk_setup(void) machclk_usepcc = 1; -#if (!defined(__i386__) && !defined(__alpha__)) || defined(ALTQ_NOPCC) +#if (!defined(__alpha__) && !defined(__amd64__) && !defined(__i386__)) || \ + defined(ALTQ_NOPCC) machclk_usepcc = 0; #endif #if defined(__FreeBSD__) && defined(SMP) @@ -947,7 +948,7 @@ init_machclk_setup(void) #if defined(__NetBSD__) && defined(MULTIPROCESSOR) machclk_usepcc = 0; #endif -#ifdef __i386__ +#if defined(__amd64__) || defined(__i386__) /* check if TSC is available */ if (machclk_usepcc == 1 && ((cpu_feature & CPUID_TSC) == 0 || tsc_is_broken)) @@ -980,7 +981,7 @@ init_machclk(void) * if the clock frequency (of Pentium TSC or Alpha PCC) is * accessible, just use it. */ -#ifdef __i386__ +#if defined(__amd64__) || defined(__i386__) #ifdef __FreeBSD__ machclk_freq = tsc_freq; #elif defined(__NetBSD__) @@ -1040,7 +1041,7 @@ read_machclk(void) u_int64_t val; if (machclk_usepcc) { -#if defined(__i386__) +#if defined(__amd64__) || defined(__i386__) val = rdtsc(); #elif defined(__alpha__) static u_int32_t last_pcc, upper; |
