From 7df55dcdeb4359716cc7b6a3381d2772e1187d62 Mon Sep 17 00:00:00 2001 From: jkim Date: Fri, 11 Mar 2011 00:44:32 +0000 Subject: Add a tunable "machdep.disable_tsc" to turn off TSC. Specifically, it turns off boot-time CPU frequency calibration, DELAY(9) with TSC, and using TSC as a CPU ticker. Note tsc_present does not change by this tunable. --- sys/contrib/altq/altq/altq_subr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/contrib') diff --git a/sys/contrib/altq/altq/altq_subr.c b/sys/contrib/altq/altq/altq_subr.c index 7d2fc77..a58747d 100644 --- a/sys/contrib/altq/altq/altq_subr.c +++ b/sys/contrib/altq/altq/altq_subr.c @@ -78,10 +78,10 @@ #include #endif #if defined(__amd64__) || defined(__i386__) +#include /* for cpu_feature or tsc_present */ #include /* for pentium tsc */ #if defined(__NetBSD__) || defined(__OpenBSD__) #include /* for CPUID_TSC */ -#include /* for cpu_feature */ #endif #endif /* __amd64 || __i386__ */ @@ -927,7 +927,7 @@ init_machclk_setup(void) #if defined(__amd64__) || defined(__i386__) /* check if TSC is available */ #ifdef __FreeBSD__ - if (tsc_freq == 0) + if (!tsc_present || tsc_freq == 0) #else if ((cpu_feature & CPUID_TSC) == 0) #endif -- cgit v1.1