Date: Sat, 1 Sep 2012 07:35:17 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r239971 - head/sys/modules/dtrace/dtraceall Message-ID: <201209010735.q817ZHmH069647@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <sys/module.h> #include <sys/errno.h> #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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209010735.q817ZHmH069647>