From owner-svn-src-head@FreeBSD.ORG  Tue Oct 28 04:18:09 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
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 EC13FD13;
 Tue, 28 Oct 2014 04:18:09 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D82FE92E;
 Tue, 28 Oct 2014 04:18:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9S4I9Yq094391;
 Tue, 28 Oct 2014 04:18:09 GMT (envelope-from julian@FreeBSD.org)
Received: (from julian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9S4I9qh094390;
 Tue, 28 Oct 2014 04:18:09 GMT (envelope-from julian@FreeBSD.org)
Message-Id: <201410280418.s9S4I9qh094390@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: julian set sender to
 julian@FreeBSD.org using -f
From: Julian Elischer <julian@FreeBSD.org>
Date: Tue, 28 Oct 2014 04:18:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r273762 - head/sys/modules/dtrace/dtraceall
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Oct 2014 04:18:10 -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