From owner-svn-src-head@FreeBSD.ORG Tue Mar 15 17:19:53 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 28E7D106566B; Tue, 15 Mar 2011 17:19:53 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 158738FC08; Tue, 15 Mar 2011 17:19:53 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2FHJqL5049919; Tue, 15 Mar 2011 17:19:52 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2FHJqVC049913; Tue, 15 Mar 2011 17:19:52 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201103151719.p2FHJqVC049913@svn.freebsd.org> From: Jung-uk Kim Date: Tue, 15 Mar 2011 17:19:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219673 - in head/sys: amd64/include contrib/altq/altq i386/i386 pc98/pc98 x86/x86 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Mar 2011 17:19:53 -0000 Author: jkim Date: Tue Mar 15 17:19:52 2011 New Revision: 219673 URL: http://svn.freebsd.org/changeset/base/219673 Log: Deprecate tsc_present as the last of its real consumers finally disappeared. Modified: head/sys/amd64/include/cpu.h head/sys/contrib/altq/altq/altq_subr.c head/sys/i386/i386/machdep.c head/sys/pc98/pc98/machdep.c head/sys/x86/x86/tsc.c Modified: head/sys/amd64/include/cpu.h ============================================================================== --- head/sys/amd64/include/cpu.h Tue Mar 15 17:14:26 2011 (r219672) +++ head/sys/amd64/include/cpu.h Tue Mar 15 17:19:52 2011 (r219673) @@ -56,7 +56,6 @@ #ifdef _KERNEL extern char btext[]; extern char etext[]; -extern int tsc_present; void cpu_halt(void); void cpu_reset(void); Modified: head/sys/contrib/altq/altq/altq_subr.c ============================================================================== --- head/sys/contrib/altq/altq/altq_subr.c Tue Mar 15 17:14:26 2011 (r219672) +++ head/sys/contrib/altq/altq/altq_subr.c Tue Mar 15 17:19:52 2011 (r219673) @@ -78,10 +78,12 @@ #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 */ +#ifdef __FreeBSD__ +#include /* for cpu_feature */ +#elif defined(__NetBSD__) || defined(__OpenBSD__) +#include /* 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 Modified: head/sys/i386/i386/machdep.c ============================================================================== --- head/sys/i386/i386/machdep.c Tue Mar 15 17:14:26 2011 (r219672) +++ head/sys/i386/i386/machdep.c Tue Mar 15 17:19:52 2011 (r219673) @@ -1141,7 +1141,7 @@ cpu_est_clockrate(int cpu_id, uint64_t * if (pcpu_find(cpu_id) == NULL || rate == NULL) return (EINVAL); - if (!tsc_present) + if ((cpu_feature & CPUID_TSC) == 0) return (EOPNOTSUPP); /* If TSC is P-state invariant, DELAY(9) based logic fails. */ Modified: head/sys/pc98/pc98/machdep.c ============================================================================== --- head/sys/pc98/pc98/machdep.c Tue Mar 15 17:14:26 2011 (r219672) +++ head/sys/pc98/pc98/machdep.c Tue Mar 15 17:19:52 2011 (r219673) @@ -1076,7 +1076,7 @@ cpu_est_clockrate(int cpu_id, uint64_t * if (pcpu_find(cpu_id) == NULL || rate == NULL) return (EINVAL); - if (!tsc_present) + if ((cpu_feature & CPUID_TSC) == 0) return (EOPNOTSUPP); /* If we're booting, trust the rate calibrated moments ago. */ Modified: head/sys/x86/x86/tsc.c ============================================================================== --- head/sys/x86/x86/tsc.c Tue Mar 15 17:14:26 2011 (r219672) +++ head/sys/x86/x86/tsc.c Tue Mar 15 17:19:52 2011 (r219673) @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); uint64_t tsc_freq; int tsc_is_invariant; -int tsc_present; static eventhandler_tag tsc_levels_tag, tsc_pre_tag, tsc_post_tag; SYSCTL_INT(_kern_timecounter, OID_AUTO, invariant_tsc, CTLFLAG_RDTUN, @@ -89,11 +88,7 @@ init_TSC(void) { u_int64_t tscval[2]; - if ((cpu_feature & CPUID_TSC) == 0) - return; - tsc_present = 1; - - if (tsc_disabled) + if ((cpu_feature & CPUID_TSC) == 0 || tsc_disabled) return; if (bootverbose) @@ -155,7 +150,7 @@ void init_TSC_tc(void) { - if (!tsc_present || tsc_disabled) + if ((cpu_feature & CPUID_TSC) == 0 || tsc_disabled) return; /*