From owner-freebsd-hackers@FreeBSD.ORG  Tue Jul 10 17:02:09 2012
Return-Path: <owner-freebsd-hackers@FreeBSD.ORG>
Delivered-To: freebsd-hackers@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 407E3106564A;
	Tue, 10 Jul 2012 17:02:09 +0000 (UTC)
	(envelope-from seanbru@yahoo-inc.com)
Received: from mrout1-b.corp.bf1.yahoo.com (mrout1-b.corp.bf1.yahoo.com
	[98.139.253.104])
	by mx1.freebsd.org (Postfix) with ESMTP id E9DA08FC0C;
	Tue, 10 Jul 2012 17:02:08 +0000 (UTC)
Received: from [IPv6:::1] (rideseveral.corp.yahoo.com [10.73.160.231])
	by mrout1-b.corp.bf1.yahoo.com (8.14.4/8.14.4/y.out) with ESMTP id
	q6AH0un7009786; Tue, 10 Jul 2012 10:00:57 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yahoo-inc.com;
	s=cobra; t=1341939658;
	bh=SefkWQ+qssDMfaF/s2AWGWcW2JeI68oq1zkOALIpvGc=;
	h=Subject:From:To:Cc:In-Reply-To:References:Content-Type:Date:
	Message-ID:Mime-Version:Content-Transfer-Encoding;
	b=emWve+pg8NxcS+xxixSICI4nT/pQqW7xQWVsF7d6wkSKezkqzBXA0EaFkdlLCCMSZ
	su1uSu5SXJ97fcBdBVME5TMIzeUoqkuVtBIRQ7gjP7evqafV2lKwb4z+Vepw06Tmym
	Mvli0f3QDEBy7+IKivBewaGYdL5Og4vFNo7wNE8E=
From: Sean Bruno <seanbru@yahoo-inc.com>
To: Fabian Keil <freebsd-listen@fabiankeil.de>
In-Reply-To: <20120710154128.192eb8d6@fabiankeil.de>
References: <1341863341.6064.11.camel@powernoodle.corp.yahoo.com>
	<4FFB4770.7050209@FreeBSD.org> <20120710154128.192eb8d6@fabiankeil.de>
Content-Type: text/plain; charset="UTF-8"
Date: Tue, 10 Jul 2012 09:52:35 -0700
Message-ID: <1341939155.2573.8.camel@powernoodle.corp.yahoo.com>
Mime-Version: 1.0
X-Mailer: Evolution 2.32.1 FreeBSD GNOME Team Port 
Content-Transfer-Encoding: 7bit
X-Milter-Version: master.31+4-gbc07cd5+
X-CLX-ID: 939657002
Cc: "freebsd-hackers@FreeBSD.org" <freebsd-hackers@FreeBSD.org>,
	Sean Bruno <sbruno@FreeBSD.org>, Andriy Gapon <avg@FreeBSD.org>,
	"rmacklem@FreeBSD.org" <rmacklem@FreeBSD.org>
Subject: Re: dtraceall.ko with old nfsclient
X-BeenThere: freebsd-hackers@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Technical Discussions relating to FreeBSD
	<freebsd-hackers.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>, 
	<mailto:freebsd-hackers-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-hackers>
List-Post: <mailto:freebsd-hackers@freebsd.org>
List-Help: <mailto:freebsd-hackers-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>,
	<mailto:freebsd-hackers-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Jul 2012 17:02:09 -0000

On Tue, 2012-07-10 at 06:41 -0700, Fabian Keil wrote:
> > >
> --- //depot/yahoo/ybsd_9/src/sys/modules/dtrace/dtraceall/dtraceall.c
> > > 2011-11-02 23:46:55.000000000 0000
> > >
> +++ /home/seanbru/dtrace_9/src/sys/modules/dtrace/dtraceall/dtraceall.c
> > > 2011-11-02 23:46:55.000000000 0000
> > > @@ -66,8 +66,11 @@
> > >  MODULE_DEPEND(dtraceall, opensolaris, 1, 1, 1);
> > >  MODULE_DEPEND(dtraceall, dtrace, 1, 1, 1);
> > >  MODULE_DEPEND(dtraceall, dtmalloc, 1, 1, 1);
> > > +#if defined (NFSCL)
> > >  MODULE_DEPEND(dtraceall, dtnfscl, 1, 1, 1);
> > > +#else /* defined (NFSCLIENT) */
> 
> Any objections to changing this to
> #elif defined (NFSCLIENT)
> ? 

No objections here.  I suspect that this is the more correct thing
regardless.  I mean, it keeps the nfs dtrace objects loading in the
event someone is running a non-nfs kernel... right?

Sean