From owner-svn-src-all@FreeBSD.ORG Tue Oct 21 04:31:08 2008 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1A985106567C; Tue, 21 Oct 2008 04:31:08 +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 095198FC20; Tue, 21 Oct 2008 04:31:08 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9L4V77S088979; Tue, 21 Oct 2008 04:31:07 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9L4V7Pb088978; Tue, 21 Oct 2008 04:31:07 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <200810210431.m9L4V7Pb088978@svn.freebsd.org> From: Jung-uk Kim Date: Tue, 21 Oct 2008 04:31:07 +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: r184108 - head/sys/i386/i386 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Oct 2008 04:31:08 -0000 Author: jkim Date: Tue Oct 21 04:31:07 2008 New Revision: 184108 URL: http://svn.freebsd.org/changeset/base/184108 Log: Fix 'kern.timeconter.invariant_tsc' tunable and back out a redundant hack. Somehow incomplete version was committed. :-( Modified: head/sys/i386/i386/tsc.c Modified: head/sys/i386/i386/tsc.c ============================================================================== --- head/sys/i386/i386/tsc.c Tue Oct 21 03:18:02 2008 (r184107) +++ head/sys/i386/i386/tsc.c Tue Oct 21 04:31:07 2008 (r184108) @@ -53,7 +53,8 @@ u_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, - &tsc_is_invariant, 0, "Indicates the TSC is P-state invariant"); + &tsc_is_invariant, 0, "Indicates whether the TSC is P-state invariant"); +TUNABLE_INT("kern.timecounter.invariant_tsc", &tsc_is_invariant); #ifdef SMP static int smp_tsc; @@ -111,9 +112,8 @@ init_TSC(void) set_cputicker(rdtsc, tsc_freq, 1); /* Register to find out about changes in CPU frequency. */ - if (!tsc_is_invariant) - tsc_pre_tag = EVENTHANDLER_REGISTER(cpufreq_pre_change, - tsc_freq_changing, NULL, EVENTHANDLER_PRI_FIRST); + tsc_pre_tag = EVENTHANDLER_REGISTER(cpufreq_pre_change, + tsc_freq_changing, NULL, EVENTHANDLER_PRI_FIRST); tsc_post_tag = EVENTHANDLER_REGISTER(cpufreq_post_change, tsc_freq_changed, NULL, EVENTHANDLER_PRI_FIRST); tsc_levels_tag = EVENTHANDLER_REGISTER(cpufreq_levels_changed,