From owner-svn-src-all@freebsd.org  Mon Aug 24 03:41:15 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A10C39C1329;
 Mon, 24 Aug 2015 03:41:15 +0000 (UTC)
 (envelope-from julian@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 911FD1C41;
 Mon, 24 Aug 2015 03:41:15 +0000 (UTC)
 (envelope-from julian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7O3fFuk084300;
 Mon, 24 Aug 2015 03:41:15 GMT (envelope-from julian@FreeBSD.org)
Received: (from julian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7O3fFqa084299;
 Mon, 24 Aug 2015 03:41:15 GMT (envelope-from julian@FreeBSD.org)
Message-Id: <201508240341.t7O3fFqa084299@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: julian set sender to
 julian@FreeBSD.org using -f
From: Julian Elischer <julian@FreeBSD.org>
Date: Mon, 24 Aug 2015 03:41:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r287090 - stable/10/sys/modules/dtrace/dtraceall
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Aug 2015 03:41:15 -0000

Author: julian
Date: Mon Aug 24 03:41:14 2015
New Revision: 287090
URL: https://svnweb.freebsd.org/changeset/base/287090

Log:
  MFH: r273762
  MFH: r276304
  
  Allow loading of dtraceall without nfscl if what you really want is nfsclient
  
  Obtained from:	Panzura tree and Rick Maclem

Modified:
  stable/10/sys/modules/dtrace/dtraceall/dtraceall.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/modules/dtrace/dtraceall/dtraceall.c
==============================================================================
--- stable/10/sys/modules/dtrace/dtraceall/dtraceall.c	Mon Aug 24 01:53:18 2015	(r287089)
+++ stable/10/sys/modules/dtrace/dtraceall/dtraceall.c	Mon Aug 24 03:41:14 2015	(r287090)
@@ -66,7 +66,9 @@ MODULE_VERSION(dtraceall, 1);
 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);
+#endif
 #if defined(NFSCLIENT)
 MODULE_DEPEND(dtraceall, dtnfsclient, 1, 1, 1);
 #endif