From owner-svn-src-stable@FreeBSD.ORG Wed Jan 12 10:12:32 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 97537106566B; Wed, 12 Jan 2011 10:12:32 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6CE4E8FC1A; Wed, 12 Jan 2011 10:12:32 +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 p0CACWr5080260; Wed, 12 Jan 2011 10:12:32 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0CACWl6080258; Wed, 12 Jan 2011 10:12:32 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201101121012.p0CACWl6080258@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Wed, 12 Jan 2011 10:12:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217302 - stable/8/sys/kern X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Jan 2011 10:12:32 -0000 Author: bz Date: Wed Jan 12 10:12:32 2011 New Revision: 217302 URL: http://svn.freebsd.org/changeset/base/217302 Log: MFC r216340,217195: Don't tie ct_debug to bootverbose. Provide a sysctl to turn it on or off. Switch the default to always off. Improve style and wording of comments and sysctl descriptions [1]. Move machdep.ct_debug to debug.clocktime as there was no reason to actually put it under machdep in r216340. Submitted by: bde [1] Modified: stable/8/sys/kern/subr_clock.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/kern/subr_clock.c ============================================================================== --- stable/8/sys/kern/subr_clock.c Wed Jan 12 08:09:29 2011 (r217301) +++ stable/8/sys/kern/subr_clock.c Wed Jan 12 10:12:32 2011 (r217302) @@ -49,20 +49,14 @@ __FBSDID("$FreeBSD$"); #include #include -#define ct_debug bootverbose -static int adjkerntz; /* local offset from UTC in seconds */ -static int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */ - int tz_minuteswest; int tz_dsttime; /* - * This have traditionally been in machdep, but should probably be moved to - * kern. + * The adjkerntz and wall_cmos_clock sysctls are in the "machdep" sysctl + * namespace because they were misplaced there originally. */ -SYSCTL_INT(_machdep, OID_AUTO, wall_cmos_clock, - CTLFLAG_RW, &wall_cmos_clock, 0, "CMOS clock keeps wall time"); - +static int adjkerntz; static int sysctl_machdep_adjkerntz(SYSCTL_HANDLER_ARGS) { @@ -72,11 +66,18 @@ sysctl_machdep_adjkerntz(SYSCTL_HANDLER_ resettodr(); return (error); } - SYSCTL_PROC(_machdep, OID_AUTO, adjkerntz, CTLTYPE_INT|CTLFLAG_RW, &adjkerntz, 0, sysctl_machdep_adjkerntz, "I", "Local offset from UTC in seconds"); +static int ct_debug; +SYSCTL_INT(_debug, OID_AUTO, clocktime, CTLFLAG_RW, + &ct_debug, 0, "Enable printing of clocktime debugging"); + +static int wall_cmos_clock; +SYSCTL_INT(_machdep, OID_AUTO, wall_cmos_clock, CTLFLAG_RW, + &wall_cmos_clock, 0, "Enables application of machdep.adjkerntz"); + /*--------------------------------------------------------------------* * Generic routines to convert between a POSIX date * (seconds since 1/1/1970) and yr/mo/day/hr/min/sec