Date: Thu, 19 Nov 2009 14:19:29 -0500 From: John Baldwin <jhb@freebsd.org> To: Julian Elischer <julian@elischer.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r199538 - head/sys/dev/lmc Message-ID: <200911191419.30432.jhb@freebsd.org> In-Reply-To: <4B0590B2.1010007@elischer.org> References: <200911191821.nAJILpZ6014634@svn.freebsd.org> <4B0590B2.1010007@elischer.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thursday 19 November 2009 1:38:42 pm Julian Elischer wrote: > John Baldwin wrote: > > Author: jhb > > Date: Thu Nov 19 18:21:51 2009 > > > +# if (__FreeBSD_version >= 500000) > > + callout_init(&sc->callout, 0); > > +# else /* FreeBSD-4 */ > > + callout_init(&sc->callout); > > +# endif > > + > > > I think the OpenBSD and _FreeBSD_version >= 500000 > conditions can probably be removed.. > > > > > > #ifdef __FreeBSD__ > > + struct callout callout; /* watchdog needs this */ > > struct device *dev; /* base device pointer */ > > bus_space_tag_t csr_tag; /* bus_space needs this */ > > bus_space_handle_t csr_handle;/* bus_space_needs this */ > > along with #ifdef __FreeBSD__ Go for it. :) I was just removing if_watchdog use in this sweep. No one stepped up to test this since I posted it almost 2 weeks ago though, so I'm not sure if there are any users of this. -- John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911191419.30432.jhb>