From owner-svn-src-all@FreeBSD.ORG Sat Sep 1 07:35:17 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 68F7D106566B; Sat, 1 Sep 2012 07:35:17 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 540E18FC0A; Sat, 1 Sep 2012 07:35:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q817ZHpQ069651; Sat, 1 Sep 2012 07:35:17 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q817ZHmH069647; Sat, 1 Sep 2012 07:35:17 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <201209010735.q817ZHmH069647@svn.freebsd.org> From: Rui Paulo Date: Sat, 1 Sep 2012 07:35:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r239971 - head/sys/modules/dtrace/dtraceall X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Sep 2012 07:35:17 -0000 Author: rpaulo Date: Sat Sep 1 07:35:16 2012 New Revision: 239971 URL: http://svn.freebsd.org/changeset/base/239971 Log: The dtnfsclient module dependency should only be added if the old NFS client support was compiled in. Modified: head/sys/modules/dtrace/dtraceall/Makefile head/sys/modules/dtrace/dtraceall/dtraceall.c Modified: head/sys/modules/dtrace/dtraceall/Makefile ============================================================================== --- head/sys/modules/dtrace/dtraceall/Makefile Sat Sep 1 07:11:25 2012 (r239970) +++ head/sys/modules/dtrace/dtraceall/Makefile Sat Sep 1 07:35:16 2012 (r239971) @@ -1,7 +1,7 @@ # $FreeBSD$ KMOD= dtraceall -SRCS= dtraceall.c opt_compat.h +SRCS= dtraceall.c opt_compat.h opt_nfs.h CFLAGS+= -I${.CURDIR}/../../.. Modified: head/sys/modules/dtrace/dtraceall/dtraceall.c ============================================================================== --- head/sys/modules/dtrace/dtraceall/dtraceall.c Sat Sep 1 07:11:25 2012 (r239970) +++ head/sys/modules/dtrace/dtraceall/dtraceall.c Sat Sep 1 07:35:16 2012 (r239971) @@ -33,6 +33,7 @@ #include #include #include "opt_compat.h" +#include "opt_nfs.h" static int dtraceall_modevent(module_t mod __unused, int type, void *data __unused) @@ -68,7 +69,9 @@ MODULE_DEPEND(dtraceall, dtrace, 1, 1, 1 MODULE_DEPEND(dtraceall, dtio, 1, 1, 1); MODULE_DEPEND(dtraceall, dtmalloc, 1, 1, 1); MODULE_DEPEND(dtraceall, dtnfscl, 1, 1, 1); +#if defined(NFSCLIENT) MODULE_DEPEND(dtraceall, dtnfsclient, 1, 1, 1); +#endif #if defined(__amd64__) || defined(__i386__) MODULE_DEPEND(dtraceall, fbt, 1, 1, 1); MODULE_DEPEND(dtraceall, fasttrap, 1, 1, 1);