From owner-cvs-src@FreeBSD.ORG Wed Apr 7 12:47:50 2004 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AC02216A4CE for ; Wed, 7 Apr 2004 12:47:50 -0700 (PDT) Received: from mail4.speakeasy.net (mail4.speakeasy.net [216.254.0.204]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8931E43D53 for ; Wed, 7 Apr 2004 12:47:50 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 1409 invoked from network); 7 Apr 2004 19:46:30 -0000 Received: from dsl027-160-063.atl1.dsl.speakeasy.net (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) encrypted SMTP for ; 7 Apr 2004 19:46:30 -0000 Received: from 10.50.40.205 (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.10/8.12.10) with ESMTP id i37JjkND013535; Wed, 7 Apr 2004 15:46:06 -0400 (EDT) (envelope-from jhb@FreeBSD.org) From: John Baldwin To: Colin Percival Date: Wed, 7 Apr 2004 13:05:21 -0400 User-Agent: KMail/1.6 References: <20040406230958.C01C616A545@hub.freebsd.org> <20040406162703.H30263@root.org> <6.0.1.1.1.20040407004244.03f85e80@imap.sfu.ca> In-Reply-To: <6.0.1.1.1.20040407004244.03f85e80@imap.sfu.ca> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200404071305.21311.jhb@FreeBSD.org> X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on server.baldwin.cx cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org cc: Colin Percival cc: Nate Lawson Subject: Re: cvs commit: src/sys/kern kern_timeout.c src/sys/sys callout.h src/share/man/man9 timeout.9 X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Apr 2004 19:47:50 -0000 On Tuesday 06 April 2004 07:52 pm, Colin Percival wrote: > >> int callout_stop(struct callout *); > >> +#define callout_stop(c) _callout_stop_safe(c, 0) > > > >The goal here is to keep binary compatibility (multiple defines of > >callout_stop)? > > The goal was binary compatibility; the callout_stop prototype was > still here because gcc complained while compiling kern_timeout.c > otherwise. If there's a better solution, please let me know. You could move the prototype into kern_timeout.c to avoid having any code use it by accident. For what it's worth, I don't think preserving binary compatibility with 5.[012] is worth it for this function. I'd just axe the old one altogether. > >Are you > >going to remove that shim at some point? Perhaps a BURN_BRIDGES or > >GONE_IN_6 ifdef would be appropriate for that. > > I think this shim can be removed as soon as any modules which know > about callout_stop have been recompiled; I doubt it will take long > before someone makes a change which requires that to happen. :-) They all just got recompiled because callout.h changed. 3rd party modules will all be recompiled for 5.3 anyway, so I would recommend just going ahead and axeing it now. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org