Merge ^/head r274961 through r276301.

11 files changed, 7 insertions, 81 deletions

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 54533f2..0b1252d 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -248,14 +248,11 @@ SUBDIR=	\
 	netfpga10g \
 	${_netgraph} \
 	${_nfe} \
-	nfs_common \
 	nfscl \
-	nfsclient \
 	nfscommon \
 	nfsd \
 	nfslock \
 	nfslockd \
-	nfsserver \
 	nfssvc \
 	nge \
 	nmdm \
diff --git a/sys/modules/cryptodev/Makefile b/sys/modules/cryptodev/Makefile
index a82517d..cc5ca12 100644
--- a/sys/modules/cryptodev/Makefile
+++ b/sys/modules/cryptodev/Makefile
@@ -3,6 +3,6 @@
 .PATH:	${.CURDIR}/../../opencrypto
 KMOD	= cryptodev
 SRCS	= cryptodev.c
-SRCS	+= bus_if.h device_if.h opt_compat.h
+SRCS	+= bus_if.h device_if.h opt_compat.h opt_kdtrace.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/dtrace/Makefile b/sys/modules/dtrace/Makefile
index b84c632..08b6937 100644
--- a/sys/modules/dtrace/Makefile
+++ b/sys/modules/dtrace/Makefile
@@ -4,7 +4,6 @@
 
 SUBDIR=		dtmalloc	\
 		dtnfscl		\
-		dtnfsclient	\
 		dtrace		\
 		dtraceall	\
 		dtrace_test	\
diff --git a/sys/modules/dtrace/dtnfsclient/Makefile b/sys/modules/dtrace/dtnfsclient/Makefile
deleted file mode 100644
index 1c5208f..0000000
--- a/sys/modules/dtrace/dtnfsclient/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-SYSDIR?=	${.CURDIR}/../../..
-
-.PATH:		${SYSDIR}/nfsclient
-
-KMOD=		dtnfsclient
-SRCS=		nfs_kdtrace.c
-SRCS+=		vnode_if.h
-
-CFLAGS+=	-I${SYSDIR}/cddl/compat/opensolaris \
-		-I${SYSDIR}/cddl/contrib/opensolaris/uts/common \
-		-I${SYSDIR}
-
-.include <bsd.kmod.mk>
-
-CFLAGS+=	-include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h
diff --git a/sys/modules/dtrace/dtraceall/dtraceall.c b/sys/modules/dtrace/dtraceall/dtraceall.c
index eda740e..c144d06 100644
--- a/sys/modules/dtrace/dtraceall/dtraceall.c
+++ b/sys/modules/dtrace/dtraceall/dtraceall.c
@@ -69,9 +69,6 @@ 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
 #if defined(__amd64__) || defined(__i386__) || defined(__powerpc__)
 MODULE_DEPEND(dtraceall, fbt, 1, 1, 1);
 #endif
diff --git a/sys/modules/geom/geom_sched/gs_sched/Makefile b/sys/modules/geom/geom_sched/gs_sched/Makefile
index 5739365..13bb91b 100644
--- a/sys/modules/geom/geom_sched/gs_sched/Makefile
+++ b/sys/modules/geom/geom_sched/gs_sched/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 KMOD=   geom_sched
-SRCS=   g_sched.c subr_disk.c
+SRCS=   g_sched.c
 
 # ../Makefile.inc automatically included
 .include <bsd.kmod.mk>
diff --git a/sys/modules/geom/geom_sched/gsched_rr/Makefile b/sys/modules/geom/geom_sched/gsched_rr/Makefile
index 4209277..44cc566 100644
--- a/sys/modules/geom/geom_sched/gsched_rr/Makefile
+++ b/sys/modules/geom/geom_sched/gsched_rr/Makefile
@@ -2,8 +2,6 @@
 
 KMOD=   gsched_rr
 SRCS=   gs_rr.c
-# hash.h on 6.x has a (char *) cast on a const pointer
-#CWARNFLAGS=
 
 # ../Makefile.inc automatically included
 .include <bsd.kmod.mk>
diff --git a/sys/modules/if_gif/Makefile b/sys/modules/if_gif/Makefile
index 663c679..3b3a172 100644
--- a/sys/modules/if_gif/Makefile
+++ b/sys/modules/if_gif/Makefile
@@ -6,7 +6,11 @@ SYSDIR?=${.CURDIR}/../..
 .PATH: ${SYSDIR}/net ${SYSDIR}/netinet ${SYSDIR}/netinet6
 
 KMOD=	if_gif
-SRCS=	if_gif.c in_gif.c opt_inet.h opt_inet6.h
+SRCS=	if_gif.c opt_inet.h opt_inet6.h
+
+.if ${MK_INET_SUPPORT} != "no"
+SRCS+=	in_gif.c
+.endif
 
 .if ${MK_INET6_SUPPORT} != "no"
 SRCS+=	in6_gif.c
diff --git a/sys/modules/nfs_common/Makefile b/sys/modules/nfs_common/Makefile
deleted file mode 100644
index 8f51f18..0000000
--- a/sys/modules/nfs_common/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../nfs
-
-KMOD=	nfs_common
-SRCS=	nfs_common.c opt_nfs.h vnode_if.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/nfsclient/Makefile b/sys/modules/nfsclient/Makefile
deleted file mode 100644
index a015f34..0000000
--- a/sys/modules/nfsclient/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../nfsclient ${.CURDIR}/../../nfs ${.CURDIR}/../../rpc
-
-KMOD=	nfsclient
-SRCS=	vnode_if.h \
-	nfs_bio.c nfs_node.c nfs_subs.c nfs_nfsiod.c \
-	nfs_vfsops.c nfs_vnops.c nfs_krpc.c \
-	opt_inet.h opt_nfs.h opt_bootp.h opt_nfsroot.h
-SRCS+=	opt_inet6.h opt_kgssapi.h
-
-.if !defined(KERNBUILDDIR)
-NFS_ROOT?=	1	# 0/1 - requires NFS_ROOT to be configured in kernel
-
-.if ${NFS_ROOT} > 0
-opt_nfsroot.h:
-	echo "#define NFS_ROOT 1" > ${.TARGET}
-.endif
-.else
-OPT_NFS_ROOT!=	cat ${KERNBUILDDIR}/opt_nfsroot.h
-.if empty(OPT_NFS_ROOT)
-NFS_ROOT=	0
-.else
-NFS_ROOT=	1
-.endif
-.endif
-
-.if ${NFS_ROOT} > 0
-SRCS+=	nfs_diskless.c
-.endif
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/nfsserver/Makefile b/sys/modules/nfsserver/Makefile
deleted file mode 100644
index d00fe47..0000000
--- a/sys/modules/nfsserver/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../nfsserver ${.CURDIR}/../../nfs
-KMOD=	nfsserver
-SRCS=	vnode_if.h \
-	nfs_fha.c nfs_fha_old.c nfs_serv.c nfs_srvkrpc.c nfs_srvsubs.c \
-	opt_mac.h \
-	opt_kgssapi.h \
-	opt_nfs.h
-SRCS+=	opt_inet6.h
-
-.include <bsd.kmod.mk>