From owner-svn-src-head@FreeBSD.ORG Sat Nov 1 16:11:20 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 33BDC5BB for ; Sat, 1 Nov 2014 16:11:20 +0000 (UTC) Received: from vfemail.net (nine.vfemail.net [108.76.175.9]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BBB86825 for ; Sat, 1 Nov 2014 16:11:19 +0000 (UTC) Received: (qmail 5198 invoked by uid 89); 1 Nov 2014 16:06:45 -0000 Received: from localhost (HELO freequeue.vfemail.net) (127.0.0.1) by localhost with (DHE-RSA-AES256-SHA encrypted) SMTP; 1 Nov 2014 16:06:39 -0000 Received: (qmail 85632 invoked by uid 89); 31 Oct 2014 15:19:19 -0000 Received: by simscan 1.3.1 ppid: 85624, pid: 85628, t: 0.1011s scanners:none Received: from unknown (HELO smtp102-2.vfemail.net) (172.16.100.62) by FreeQueue with SMTP; 31 Oct 2014 15:19:19 -0000 Received: (qmail 30168 invoked by uid 89); 31 Oct 2014 15:19:19 -0000 Received: by simscan 1.4.0 ppid: 30127, pid: 30164, t: 0.6638s scanners:none Received: from unknown (HELO nil) (amJlaWNoQHZmZW1haWwubmV0@172.16.100.27) by 172.16.100.62 with ESMTPA; 31 Oct 2014 15:19:18 -0000 From: Jan Beich To: Julian Elischer Subject: Re: svn commit: r273762 - head/sys/modules/dtrace/dtraceall References: <201410280418.s9S4I9qh094390@svn.freebsd.org> Date: Fri, 31 Oct 2014 16:19:13 +0100 In-Reply-To: <201410280418.s9S4I9qh094390@svn.freebsd.org> (Julian Elischer's message of "Tue, 28 Oct 2014 04:18:09 +0000 (UTC)") Message-ID: MIME-Version: 1.0 Content-Type: text/plain Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Nov 2014 16:11:20 -0000 Julian Elischer writes: > Log: > Allow loading of dtraceall without nfscl if what you really wnat is nfsclient ... or if what you really want is neither, no NFS by default. > > Obtained from: Panzura tree > MFC after: 1 week > > Modified: > head/sys/modules/dtrace/dtraceall/dtraceall.c > > Modified: head/sys/modules/dtrace/dtraceall/dtraceall.c > ============================================================================== > --- head/sys/modules/dtrace/dtraceall/dtraceall.c Tue Oct 28 03:42:09 2014 (r273761) > +++ head/sys/modules/dtrace/dtraceall/dtraceall.c Tue Oct 28 04:18:09 2014 (r273762) > @@ -67,7 +67,9 @@ MODULE_DEPEND(dtraceall, cyclic, 1, 1, 1 > MODULE_DEPEND(dtraceall, opensolaris, 1, 1, 1); > MODULE_DEPEND(dtraceall, dtrace, 1, 1, 1); > MODULE_DEPEND(dtraceall, dtmalloc, 1, 1, 1); > +#if defined(NFSCLIENT) Did you mean #if defined(NFSCL) ? Otherwise, dtraceall.ko with GENERIC kernel wouldn't pull dtnfscl.ko despite nfscl.ko being compiled in. > MODULE_DEPEND(dtraceall, dtnfscl, 1, 1, 1); > +#endif > #if defined(NFSCLIENT) > MODULE_DEPEND(dtraceall, dtnfsclient, 1, 1, 1); > #endif ------------------------------------------------- VFEmail.net - http://www.vfemail.net ONLY AT VFEmail! - Use our Metadata Mitigator to keep your email out of the NSA's hands! $24.95 ONETIME Lifetime accounts with Privacy Features! 15GB disk! No bandwidth quotas! Commercial and Bulk Mail Options!