summaryrefslogtreecommitdiffstats
path: root/sys/modules/Makefile
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2007-07-14 21:49:24 +0000
committerrwatson <rwatson@FreeBSD.org>2007-07-14 21:49:24 +0000
commitea4d9ac0d1f35d1dc3dfd0333fca52e6f92ec683 (patch)
tree4aec3325f92defda29d478c1dd870656056e3c0a /sys/modules/Makefile
parent81f7b063ece187dd48e800e82efc3cc68af13eda (diff)
downloadFreeBSD-src-ea4d9ac0d1f35d1dc3dfd0333fca52e6f92ec683.zip
FreeBSD-src-ea4d9ac0d1f35d1dc3dfd0333fca52e6f92ec683.tar.gz
Disconnect netatm from the build as it is not MPSAFE and relies on
NET_NEEDS_GIANT, which will shortly be removed. This is done in a away that it may be easily reattached to the build before 7.1 if appropriate locking is added. Specifics: - Don't install netatm include files - Disconnect netatm command line management tools - Don't build libatm - Don't include ATM parts in rescue or sysinstall - Don't install sample configuration files and documents - Don't build kernel support as a module or in NOTES - Don't build netgraph wrapper nodes for netatm This removes the last remaining consumer of NET_NEEDS_GIANT. Reviewed by: harti Discussed with: bz, bms Approved by: re (kensmith)
Diffstat (limited to 'sys/modules/Makefile')
-rw-r--r--sys/modules/Makefile13
1 files changed, 10 insertions, 3 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index babb1cb..c4f402e 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -88,7 +88,7 @@ SUBDIR= ${_3dfx} \
fxp \
${_gem} \
geom \
- harp \
+ ${_harp} \
hatm \
${_hfa} \
hifn \
@@ -321,6 +321,11 @@ _vpo= vpo
_ufs= ufs
.endif
+# Disabled in 7.0 as netatm is not MPSAFE.
+#if ${MK_ATM} != "no"
+#_harp= harp
+#.endif
+
.if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
.if exists(${.CURDIR}/../opencrypto)
_crypto= crypto
@@ -376,7 +381,8 @@ _ep= ep
_exca= exca
_ext2fs= ext2fs
_fe= fe
-_hfa= hfa
+# Disabled due to non-MPSAFEty in 7.0
+#_hfa= hfa
_i2c= i2c
_ibcs2= ibcs2
_ie= ie
@@ -437,7 +443,8 @@ _hptiop= hptiop
_hptmv= hptmv
_ichwd= ichwd
_ida= ida
-_idt= idt
+# Disabled due to non-MPSAFEty in 7.0
+#_idt= idt
_iir= iir
_ipmi= ipmi
_ips= ips
OpenPOWER on IntegriCloud