From owner-svn-src-head@FreeBSD.ORG Wed Jun 8 23:45:00 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 30494106566C; Wed, 8 Jun 2011 23:45:00 +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 0675B8FC15; Wed, 8 Jun 2011 23:45:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p58NixBH052582; Wed, 8 Jun 2011 23:44:59 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p58NixUl052580; Wed, 8 Jun 2011 23:44:59 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201106082344.p58NixUl052580@svn.freebsd.org> From: Jung-uk Kim Date: Wed, 8 Jun 2011 23:44:59 +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: r222884 - head/sys/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: Wed, 08 Jun 2011 23:45:00 -0000 Author: jkim Date: Wed Jun 8 23:44:59 2011 New Revision: 222884 URL: http://svn.freebsd.org/changeset/base/222884 Log: Tidy up r222866. - Re-add accidentally removed atomic op. for sysctl(9) handler. - Remove a period(`.') at the end of a debugging message. - Consistently spell "low" for "TSC-low" timecounter throughout. Pointed out by: bde Modified: head/sys/x86/x86/tsc.c Modified: head/sys/x86/x86/tsc.c ============================================================================== --- head/sys/x86/x86/tsc.c Wed Jun 8 21:59:07 2011 (r222883) +++ head/sys/x86/x86/tsc.c Wed Jun 8 23:44:59 2011 (r222884) @@ -80,7 +80,7 @@ static void tsc_freq_changed(void *arg, static void tsc_freq_changing(void *arg, const struct cf_level *level, int *status); static unsigned tsc_get_timecount(struct timecounter *tc); -static unsigned tsc_get_timecount_lowres(struct timecounter *tc); +static unsigned tsc_get_timecount_low(struct timecounter *tc); static void tsc_levels_changed(void *arg, int unit); static struct timecounter tsc_timecounter = { @@ -464,10 +464,10 @@ init: for (shift = 0; shift < 32 && (tsc_freq >> shift) > max_freq; shift++) ; if (shift > 0) { - tsc_timecounter.tc_get_timecount = tsc_get_timecount_lowres; + tsc_timecounter.tc_get_timecount = tsc_get_timecount_low; tsc_timecounter.tc_name = "TSC-low"; if (bootverbose) - printf("TSC timecounter discards lower %d bit(s).\n", + printf("TSC timecounter discards lower %d bit(s)\n", shift); } if (tsc_freq != 0) { @@ -560,8 +560,8 @@ sysctl_machdep_tsc_freq(SYSCTL_HANDLER_A error = sysctl_handle_64(oidp, &freq, 0, req); if (error == 0 && req->newptr != NULL) { atomic_store_rel_64(&tsc_freq, freq); - tsc_timecounter.tc_frequency = - freq >> (int)(intptr_t)tsc_timecounter.tc_priv; + atomic_store_rel_64(&tsc_timecounter.tc_frequency, + freq >> (int)(intptr_t)tsc_timecounter.tc_priv); } return (error); } @@ -577,7 +577,7 @@ tsc_get_timecount(struct timecounter *tc } static u_int -tsc_get_timecount_lowres(struct timecounter *tc) +tsc_get_timecount_low(struct timecounter *tc) { return (rdtsc() >> (int)(intptr_t)tc->tc_priv);