svn commit: r273762 - head/sys/modules/dtrace/dtraceall

[Jan Beich]

Julian Elischer <julian at FreeBSD.org> writes:

> Log:
>   Allow loading of dtraceall without nfscl if what you really wnat is nfsclient

... or if what you really want is neither, no NFS by default.

>   
>   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)

Did you mean #if defined(NFSCL) ? Otherwise, dtraceall.ko with GENERIC
kernel wouldn't pull dtnfscl.ko despite nfscl.ko being compiled in.

>  MODULE_DEPEND(dtraceall, dtnfscl, 1, 1, 1);
> +#endif
>  #if defined(NFSCLIENT)
>  MODULE_DEPEND(dtraceall, dtnfsclient, 1, 1, 1);
>  #endif

-------------------------------------------------

VFEmail.net - http://www.vfemail.net
ONLY AT VFEmail! - Use our Metadata Mitigator to keep your email out of the NSA's hands!
$24.95 ONETIME Lifetime accounts with Privacy Features!  
15GB disk! No bandwidth quotas!
Commercial and Bulk Mail Options!