summaryrefslogtreecommitdiffstats
path: root/sys/modules
diff options
context:
space:
mode:
Diffstat (limited to 'sys/modules')
-rw-r--r--sys/modules/Makefile13
-rw-r--r--sys/modules/netgraph/atm/Makefile4
2 files changed, 13 insertions, 4 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
diff --git a/sys/modules/netgraph/atm/Makefile b/sys/modules/netgraph/atm/Makefile
index 51361d7..a884778 100644
--- a/sys/modules/netgraph/atm/Makefile
+++ b/sys/modules/netgraph/atm/Makefile
@@ -3,10 +3,12 @@
SUBDIR= \
atm \
atmbase \
- atmpif \
ccatm \
sscfu \
sscop \
uni
+# atmpif disabled due to non-MPSAFEty in 7.0
+# atmpif \
+
.include <bsd.subdir.mk>
OpenPOWER on IntegriCloud