From owner-svn-src-projects@FreeBSD.ORG Mon Dec 17 21:17:01 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A31091AE; Mon, 17 Dec 2012 21:17:01 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (bigknife-pt.tunnel.tserv9.chi1.ipv6.he.net [IPv6:2001:470:1f10:75::2]) by mx1.freebsd.org (Postfix) with ESMTP id 747A28FC13; Mon, 17 Dec 2012 21:17:01 +0000 (UTC) Received: from pakbsde14.localnet (unknown [38.105.238.108]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id D14D1B915; Mon, 17 Dec 2012 16:17:00 -0500 (EST) From: John Baldwin To: Alexander Motin Subject: Re: svn commit: r244249 - projects/calloutng/sys/dev/syscons Date: Mon, 17 Dec 2012 15:09:54 -0500 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p22; KDE/4.5.5; amd64; ; ) References: <201212151044.qBFAiG70038633@svn.freebsd.org> In-Reply-To: <201212151044.qBFAiG70038633@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201212171509.55216.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Mon, 17 Dec 2012 16:17:00 -0500 (EST) Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Dec 2012 21:17:01 -0000 On Saturday, December 15, 2012 5:44:16 am Alexander Motin wrote: > Author: mav > Date: Sat Dec 15 10:44:16 2012 > New Revision: 244249 > URL: http://svnweb.freebsd.org/changeset/base/244249 > > Log: > Switch syscons from timeout() to callout_reset_flags() and specify that > precision is not important there -- anything from 20 to 30Hz will be fine. > > Modified: > projects/calloutng/sys/dev/syscons/syscons.c > projects/calloutng/sys/dev/syscons/syscons.h > > Modified: projects/calloutng/sys/dev/syscons/syscons.c > ============================================================================== > --- projects/calloutng/sys/dev/syscons/syscons.c Sat Dec 15 10:30:06 2012 (r244248) > +++ projects/calloutng/sys/dev/syscons/syscons.c Sat Dec 15 10:44:16 2012 (r244249) > @@ -504,6 +504,8 @@ sc_attach_unit(int unit, int flags) > > sc = sc_get_softc(unit, flags & SC_KERNEL_CONSOLE); > sc->config = flags; > + callout_init(&sc->ctimeout, FALSE); > + callout_init(&sc->cblink, FALSE); Did you change the calling conventions for callout_init() in this branch? In HEAD the second argument is a flags variable (albeit with only a single flag defined: CALLOUT_MPSAFE). Thus, the common usage is to use 'callout_init(.., 0);' for callouts that need Giant and 'callout_init(..., CALLOUT_MPSAFE);' for those that do not need Giant. -- John Baldwin