From owner-svn-src-head@FreeBSD.ORG Tue Oct 28 06:44:07 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3F5A5808; Tue, 28 Oct 2014 06:44:07 +0000 (UTC) Received: from h2.funkthat.com (gate2.funkthat.com [208.87.223.18]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "funkthat.com", Issuer "funkthat.com" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id E687FA8E; Tue, 28 Oct 2014 06:44:06 +0000 (UTC) Received: from h2.funkthat.com (localhost [127.0.0.1]) by h2.funkthat.com (8.14.3/8.14.3) with ESMTP id s9S6i4tr080927 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 27 Oct 2014 23:44:05 -0700 (PDT) (envelope-from jmg@h2.funkthat.com) Received: (from jmg@localhost) by h2.funkthat.com (8.14.3/8.14.3/Submit) id s9S6i4nI080926; Mon, 27 Oct 2014 23:44:04 -0700 (PDT) (envelope-from jmg) Date: Mon, 27 Oct 2014 23:44:04 -0700 From: John-Mark Gurney To: Julian Elischer Subject: Re: svn commit: r273762 - head/sys/modules/dtrace/dtraceall Message-ID: <20141028064404.GV82214@funkthat.com> References: <201410280418.s9S4I9qh094390@svn.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201410280418.s9S4I9qh094390@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i X-Operating-System: FreeBSD 7.2-RELEASE i386 X-PGP-Fingerprint: 54BA 873B 6515 3F10 9E88 9322 9CB1 8F74 6D3F A396 X-Files: The truth is out there X-URL: http://resnet.uoregon.edu/~gurney_j/ X-Resume: http://resnet.uoregon.edu/~gurney_j/resume.html X-TipJar: bitcoin:13Qmb6AeTgQecazTWph4XasEsP7nGRbAPE X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN? can i haz chizburger? X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.2 (h2.funkthat.com [127.0.0.1]); Mon, 27 Oct 2014 23:44:05 -0700 (PDT) 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: Tue, 28 Oct 2014 06:44:07 -0000 Julian Elischer wrote this message on Tue, Oct 28, 2014 at 04:18 +0000: > Author: julian > Date: Tue Oct 28 04:18:09 2014 > New Revision: 273762 > URL: https://svnweb.freebsd.org/changeset/base/273762 > > Log: > Allow loading of dtraceall without nfscl if what you really wnat is nfsclient > > 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) > MODULE_DEPEND(dtraceall, dtnfscl, 1, 1, 1); > +#endif > #if defined(NFSCLIENT) > MODULE_DEPEND(dtraceall, dtnfsclient, 1, 1, 1); > #endif Why not put the MODULE_DEPEND in the same #if defined block that follows? -- John-Mark Gurney Voice: +1 415 225 5579 "All that I will do, has been done, All that I have, has not."