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)

15 files changed, 184 insertions, 155 deletions

diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index d38c479..aadeefc 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -205,16 +205,17 @@
     ..
     netatalk
     ..
-    netatm
-        ipatm
-        ..
-        sigpvc
-        ..
-        spans
-        ..
-        uni
-        ..
-    ..
+# Disabled in 7.0 as netatm is not MPSAFE.
+#    netatm
+#        ipatm
+#        ..
+#        sigpvc
+#        ..
+#        spans
+#        ..
+#        uni
+#        ..
+#    ..
     netgraph
         atm
         ..
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index c457c4a..dd039d5 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -187,8 +187,9 @@
             ..
             IPv6
             ..
-            atm
-            ..
+# Disabled in 7.0 as netatm is not MPSAFE.
+#            atm
+#            ..
             bc
             ..
             bootforth
diff --git a/include/Makefile b/include/Makefile
index 20d8d15..d012e0e 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -36,10 +36,11 @@ PHDRS=	sched.h semaphore.h _semaphore.h
 LHDRS=	aio.h errno.h fcntl.h linker_set.h poll.h stdint.h syslog.h \
 	termios.h ucontext.h
 
-LDIRS=	bsm cam geom net net80211 netatalk netatm netgraph netinet netinet6 \
+LDIRS=	bsm cam geom net net80211 netatalk netgraph netinet netinet6 \
 	netipsec ${_netipx} netnatm ${_netncp} netsmb \
 	nfs nfsclient nfsserver \
 	pccard sys vm
+#LDIRS+=	netatm
 
 LSUBDIRS=	cam/scsi \
 	dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \
@@ -49,12 +50,12 @@ LSUBDIRS=	cam/scsi \
 	${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \
 	geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \
 	geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe \
-	netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \
 	netgraph/atm netgraph/netflow \
 	security/audit \
 	security/mac_biba security/mac_bsdextended security/mac_lomac \
 	security/mac_mls security/mac_partition \
 	ufs/ffs ufs/ufs
+#LSUBDIRS+=	netatm/ipatm netatm/sigpvc netatm/spans netatm/uni
 
 .if ${MACHINE_ARCH} == "powerpc"
 _dev_powermac_nvram=	dev/powermac_nvram
diff --git a/lib/Makefile b/lib/Makefile
index 1793d56..890c3bc 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -48,7 +48,8 @@ _csu=csu
 .endif
 
 .if ${MK_ATM} != "no"
-_libatm=	libatm
+# Disabled in 7.0 as netatm is not MPSAFE.
+#_libatm=	libatm
 _libngatm=	libngatm
 .endif
 
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index 23bea89..e0c05be 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -119,8 +119,10 @@ CRUNCH_PROGS_sbin= atacontrol badsect bsdlabel		\
 	slattach spppcontrol startslip swapon sysctl tunefs umount 
 
 .if ${MK_ATM} != "no"
-CRUNCH_PROGS_sbin+= atm atmconfig fore_dnld ilmid
-CRUNCH_LIBS+= -latm
+CRUNCH_PROGS_sbin+= atmconfig
+# Disabled in 7.0 as netatm is not MPSAFE.
+#CRUNCH_PROGS_sbin+= atm fore_dnld ilmid
+#CRUNCH_LIBS+= -latm
 .endif
 
 .if ${MK_INET6_SUPPORT} != "no"
diff --git a/sbin/atm/Makefile b/sbin/atm/Makefile
index ed7ca1a..79fc6a3 100644
--- a/sbin/atm/Makefile
+++ b/sbin/atm/Makefile
@@ -23,9 +23,11 @@
 #	@(#) $Id: Makefile,v 1.5 1998/07/10 16:01:58 jpt Exp $
 # $FreeBSD$
 
-SUBDIR=	atm \
-	atmconfig \
-	fore_dnld \
-	ilmid
+SUBDIR=	atmconfig
+
+# Disabled in 7.0 as netatm is not MPSAFE.
+#	atm \
+#	fore_dnld \
+#	ilmid
 
 .include <bsd.subdir.mk>
diff --git a/share/examples/Makefile b/share/examples/Makefile
index 6d92c2d..072f6c8 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -7,7 +7,6 @@
 LDIRS=	BSD_daemon \
 	FreeBSD_version \
 	IPv6 \
-	atm \
 	bootforth \
 	cvsup \
 	diskless \
@@ -35,6 +34,9 @@ LDIRS=	BSD_daemon \
 	startslip \
 	sunrpc
 
+# Disabled in 7.0 as netatm is not MPSAFE.
+#LDIRS+=	atm
+
 XFILES=	BSD_daemon/FreeBSD.pfa \
 	BSD_daemon/README \
 	BSD_daemon/beastie.eps \
@@ -45,15 +47,6 @@ XFILES=	BSD_daemon/FreeBSD.pfa \
 	FreeBSD_version/Makefile \
 	FreeBSD_version/README \
 	IPv6/USAGE \
-	atm/NOTES \
-	atm/README \
-	atm/Startup \
-	atm/atm-config.sh \
-	atm/atm-sockets.txt \
-	atm/cpcs-design.txt \
-	atm/fore-microcode.txt \
-	atm/sscf-design.txt \
-	atm/sscop-design.txt \
 	bootforth/README \
 	bootforth/boot.4th \
 	bootforth/frames.4th \
@@ -246,6 +239,17 @@ XFILES=	BSD_daemon/FreeBSD.pfa \
 	sunrpc/sort/sort.x \
 	sunrpc/sort/sort_proc.c
 
+# Disabled in 7.0 as netatm is not MPSAFE.
+#XFILES+=	atm/NOTES \
+#	atm/README \
+#	atm/Startup \
+#	atm/atm-config.sh \
+#	atm/atm-sockets.txt \
+#	atm/cpcs-design.txt \
+#	atm/fore-microcode.txt \
+#	atm/sscf-design.txt \
+#	atm/sscop-design.txt
+
 BINDIR= ${SHAREDIR}/examples
 
 NO_OBJ=
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 85577bc..0adb769 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -891,6 +891,8 @@ options 	ZERO_COPY_SOCKETS
 #
 # ATM (HARP version) options
 #
+# XXX: These have been disabled in FreeBSD 7.0 as they are not MPSAFE.
+#
 # ATM_CORE includes the base ATM functionality code.  This must be included
 #	for ATM support.
 #
@@ -909,14 +911,14 @@ options 	ZERO_COPY_SOCKETS
 #
 # The `harp' pseudo-driver makes all NATM interface drivers available to HARP.
 #
-options 	ATM_CORE		#core ATM protocol family
-options 	ATM_IP			#IP over ATM support
-options 	ATM_SIGPVC		#SIGPVC signalling manager
-options 	ATM_SPANS		#SPANS signalling manager
-options 	ATM_UNI			#UNI signalling manager
+#options 	ATM_CORE		#core ATM protocol family
+#options 	ATM_IP			#IP over ATM support
+#options 	ATM_SIGPVC		#SIGPVC signalling manager
+#options 	ATM_SPANS		#SPANS signalling manager
+#options 	ATM_UNI			#UNI signalling manager
 
-device		hfa			#FORE PCA-200E ATM PCI
-device		harp			#Pseudo-interface for NATM
+#device		hfa			#FORE PCA-200E ATM PCI
+#device		harp			#Pseudo-interface for NATM
 
 
 #####################################################################
diff --git a/sys/conf/files b/sys/conf/files
index 8d81bae..4538dbd 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -659,28 +659,28 @@ dev/flash/at45d.c		optional at45d
 dev/fxp/if_fxp.c		optional fxp
 dev/gem/if_gem.c		optional gem
 dev/gem/if_gem_pci.c		optional gem pci
-dev/harp/if_harp.c		optional harp pci
+#dev/harp/if_harp.c		optional harp pci
 dev/hatm/if_hatm.c		optional hatm pci
 dev/hatm/if_hatm_intr.c		optional hatm pci
 dev/hatm/if_hatm_ioctl.c	optional hatm pci
 dev/hatm/if_hatm_rx.c		optional hatm pci
 dev/hatm/if_hatm_tx.c		optional hatm pci
-dev/hfa/fore_buffer.c		optional hfa
-dev/hfa/fore_command.c		optional hfa
-dev/hfa/fore_globals.c		optional hfa
-dev/hfa/fore_if.c		optional hfa
-dev/hfa/fore_init.c		optional hfa
-dev/hfa/fore_intr.c		optional hfa
-dev/hfa/fore_output.c		optional hfa
-dev/hfa/fore_receive.c		optional hfa
-dev/hfa/fore_stats.c		optional hfa
-dev/hfa/fore_timer.c		optional hfa
-dev/hfa/fore_transmit.c		optional hfa
-dev/hfa/fore_vcm.c		optional hfa
-#dev/hfa/hfa_eisa.c		optional hfa eisa
-dev/hfa/hfa_freebsd.c		optional hfa
-dev/hfa/hfa_pci.c		optional hfa pci
-#dev/hfa/hfa_sbus.c		optional hfa sbus
+#dev/hfa/fore_buffer.c		optional hfa
+#dev/hfa/fore_command.c		optional hfa
+#dev/hfa/fore_globals.c		optional hfa
+#dev/hfa/fore_if.c		optional hfa
+#dev/hfa/fore_init.c		optional hfa
+#dev/hfa/fore_intr.c		optional hfa
+#dev/hfa/fore_output.c		optional hfa
+#dev/hfa/fore_receive.c		optional hfa
+#dev/hfa/fore_stats.c		optional hfa
+#dev/hfa/fore_timer.c		optional hfa
+#dev/hfa/fore_transmit.c		optional hfa
+#dev/hfa/fore_vcm.c		optional hfa
+##dev/hfa/hfa_eisa.c		optional hfa eisa
+#dev/hfa/hfa_freebsd.c		optional hfa
+#dev/hfa/hfa_pci.c		optional hfa pci
+##dev/hfa/hfa_sbus.c		optional hfa sbus
 dev/hifn/hifn7751.c		optional hifn
 dev/hme/if_hme.c		optional hme
 dev/hme/if_hme_pci.c		optional hme pci
@@ -1660,88 +1660,92 @@ netatalk/ddp_input.c		optional netatalk
 netatalk/ddp_output.c		optional netatalk
 netatalk/ddp_pcb.c		optional netatalk
 netatalk/ddp_usrreq.c		optional netatalk
-netatm/atm_aal5.c		optional atm_core
-netatm/atm_cm.c			optional atm_core
-netatm/atm_device.c		optional atm_core
-netatm/atm_if.c			optional atm_core
-netatm/atm_proto.c		optional atm_core
-netatm/atm_signal.c		optional atm_core
-netatm/atm_socket.c		optional atm_core
-netatm/atm_subr.c		optional atm_core
-netatm/atm_usrreq.c		optional atm_core
-netatm/ipatm/ipatm_event.c	optional atm_ip atm_core
-netatm/ipatm/ipatm_if.c		optional atm_ip atm_core
-netatm/ipatm/ipatm_input.c	optional atm_ip atm_core
-netatm/ipatm/ipatm_load.c	optional atm_ip atm_core
-netatm/ipatm/ipatm_output.c	optional atm_ip atm_core
-netatm/ipatm/ipatm_usrreq.c	optional atm_ip atm_core
-netatm/ipatm/ipatm_vcm.c	optional atm_ip atm_core
-netatm/sigpvc/sigpvc_if.c	optional atm_sigpvc atm_core
-netatm/sigpvc/sigpvc_subr.c	optional atm_sigpvc atm_core
-netatm/spans/spans_arp.c	optional atm_spans atm_core	\
-	dependency	"spans_xdr.h"
-netatm/spans/spans_cls.c	optional atm_spans atm_core
-netatm/spans/spans_if.c		optional atm_spans atm_core
-netatm/spans/spans_kxdr.c	optional atm_spans atm_core
-netatm/spans/spans_msg.c	optional atm_spans atm_core
-netatm/spans/spans_print.c	optional atm_spans atm_core
-netatm/spans/spans_proto.c	optional atm_spans atm_core
-netatm/spans/spans_subr.c	optional atm_spans atm_core
-netatm/spans/spans_util.c	optional atm_spans atm_core
-spans_xdr.h			optional atm_spans atm_core	\
-	before-depend						\
-	dependency	"$S/netatm/spans/spans_xdr.x"		\
-	compile-with	"rpcgen -h -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.h" \
-	clean		"spans_xdr.h"				\
-	no-obj no-implicit-rule
-spans_xdr.c			optional atm_spans atm_core	\
-	before-depend						\
-	dependency	"$S/netatm/spans/spans_xdr.x"		\
-	compile-with	"rpcgen -c -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.c" \
-	clean		"spans_xdr.c"				\
-	no-obj no-implicit-rule local
-spans_xdr.o			optional atm_spans atm_core	\
-	dependency	"$S/netatm/spans/spans_xdr.x"		\
-	compile-with	"${NORMAL_C}"				\
-	no-implicit-rule local
-netatm/uni/q2110_sigaa.c	optional atm_uni atm_core
-netatm/uni/q2110_sigcpcs.c	optional atm_uni atm_core
-netatm/uni/q2110_subr.c		optional atm_uni atm_core
-netatm/uni/qsaal1_sigaa.c	optional atm_uni atm_core
-netatm/uni/qsaal1_sigcpcs.c	optional atm_uni atm_core
-netatm/uni/qsaal1_subr.c	optional atm_uni atm_core
-netatm/uni/sscf_uni.c		optional atm_uni atm_core
-netatm/uni/sscf_uni_lower.c	optional atm_uni atm_core
-netatm/uni/sscf_uni_upper.c	optional atm_uni atm_core
-netatm/uni/sscop.c		optional atm_uni atm_core
-netatm/uni/sscop_lower.c	optional atm_uni atm_core
-netatm/uni/sscop_pdu.c		optional atm_uni atm_core
-netatm/uni/sscop_sigaa.c	optional atm_uni atm_core
-netatm/uni/sscop_sigcpcs.c	optional atm_uni atm_core
-netatm/uni/sscop_subr.c		optional atm_uni atm_core
-netatm/uni/sscop_timer.c	optional atm_uni atm_core
-netatm/uni/sscop_upper.c	optional atm_uni atm_core
-netatm/uni/uni_load.c		optional atm_uni atm_core
-netatm/uni/uniarp.c		optional atm_uni atm_core
-netatm/uni/uniarp_cache.c	optional atm_uni atm_core
-netatm/uni/uniarp_input.c	optional atm_uni atm_core
-netatm/uni/uniarp_output.c	optional atm_uni atm_core
-netatm/uni/uniarp_timer.c	optional atm_uni atm_core
-netatm/uni/uniarp_vcm.c		optional atm_uni atm_core
-netatm/uni/uniip.c		optional atm_uni atm_core
-netatm/uni/unisig_decode.c	optional atm_uni atm_core
-netatm/uni/unisig_encode.c	optional atm_uni atm_core
-netatm/uni/unisig_if.c		optional atm_uni atm_core
-netatm/uni/unisig_mbuf.c	optional atm_uni atm_core
-netatm/uni/unisig_msg.c		optional atm_uni atm_core
-netatm/uni/unisig_print.c	optional atm_uni atm_core
-netatm/uni/unisig_proto.c	optional atm_uni atm_core
-netatm/uni/unisig_sigmgr_state.c optional atm_uni atm_core
-netatm/uni/unisig_subr.c	optional atm_uni atm_core
-netatm/uni/unisig_util.c	optional atm_uni atm_core
-netatm/uni/unisig_vc_state.c	optional atm_uni atm_core
-netgraph/atm/atmpif/ng_atmpif.c	optional netgraph_atm_atmpif
-netgraph/atm/atmpif/ng_atmpif_harp.c optional netgraph_atm_atmpif
+#
+# netatm has been disconnected from the build until it is MPSAFE, or
+# alternatively, until it is removed.
+#
+#netatm/atm_aal5.c		optional atm_core
+#netatm/atm_cm.c			optional atm_core
+#netatm/atm_device.c		optional atm_core
+#netatm/atm_if.c			optional atm_core
+#netatm/atm_proto.c		optional atm_core
+#netatm/atm_signal.c		optional atm_core
+#netatm/atm_socket.c		optional atm_core
+#netatm/atm_subr.c		optional atm_core
+#netatm/atm_usrreq.c		optional atm_core
+#netatm/ipatm/ipatm_event.c	optional atm_ip atm_core
+#netatm/ipatm/ipatm_if.c		optional atm_ip atm_core
+#netatm/ipatm/ipatm_input.c	optional atm_ip atm_core
+#netatm/ipatm/ipatm_load.c	optional atm_ip atm_core
+#netatm/ipatm/ipatm_output.c	optional atm_ip atm_core
+#netatm/ipatm/ipatm_usrreq.c	optional atm_ip atm_core
+#netatm/ipatm/ipatm_vcm.c	optional atm_ip atm_core
+#netatm/sigpvc/sigpvc_if.c	optional atm_sigpvc atm_core
+#netatm/sigpvc/sigpvc_subr.c	optional atm_sigpvc atm_core
+#netatm/spans/spans_arp.c	optional atm_spans atm_core	\
+#	dependency	"spans_xdr.h"
+#netatm/spans/spans_cls.c	optional atm_spans atm_core
+#netatm/spans/spans_if.c		optional atm_spans atm_core
+#netatm/spans/spans_kxdr.c	optional atm_spans atm_core
+#netatm/spans/spans_msg.c	optional atm_spans atm_core
+#netatm/spans/spans_print.c	optional atm_spans atm_core
+#netatm/spans/spans_proto.c	optional atm_spans atm_core
+#netatm/spans/spans_subr.c	optional atm_spans atm_core
+#netatm/spans/spans_util.c	optional atm_spans atm_core
+#spans_xdr.h			optional atm_spans atm_core	\
+#	before-depend						\
+#	dependency	"$S/netatm/spans/spans_xdr.x"		\
+#	compile-with	"rpcgen -h -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.h" \
+#	clean		"spans_xdr.h"				\
+#	no-obj no-implicit-rule
+#spans_xdr.c			optional atm_spans atm_core	\
+#	before-depend						\
+#	dependency	"$S/netatm/spans/spans_xdr.x"		\
+#	compile-with	"rpcgen -c -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.c" \
+#	clean		"spans_xdr.c"				\
+#	no-obj no-implicit-rule local
+#spans_xdr.o			optional atm_spans atm_core	\
+#	dependency	"$S/netatm/spans/spans_xdr.x"		\
+#	compile-with	"${NORMAL_C}"				\
+#	no-implicit-rule local
+#netatm/uni/q2110_sigaa.c	optional atm_uni atm_core
+#netatm/uni/q2110_sigcpcs.c	optional atm_uni atm_core
+#netatm/uni/q2110_subr.c		optional atm_uni atm_core
+#netatm/uni/qsaal1_sigaa.c	optional atm_uni atm_core
+#netatm/uni/qsaal1_sigcpcs.c	optional atm_uni atm_core
+#netatm/uni/qsaal1_subr.c	optional atm_uni atm_core
+#netatm/uni/sscf_uni.c		optional atm_uni atm_core
+#netatm/uni/sscf_uni_lower.c	optional atm_uni atm_core
+#netatm/uni/sscf_uni_upper.c	optional atm_uni atm_core
+#netatm/uni/sscop.c		optional atm_uni atm_core
+#netatm/uni/sscop_lower.c	optional atm_uni atm_core
+#netatm/uni/sscop_pdu.c		optional atm_uni atm_core
+#netatm/uni/sscop_sigaa.c	optional atm_uni atm_core
+#netatm/uni/sscop_sigcpcs.c	optional atm_uni atm_core
+#netatm/uni/sscop_subr.c		optional atm_uni atm_core
+#netatm/uni/sscop_timer.c	optional atm_uni atm_core
+#netatm/uni/sscop_upper.c	optional atm_uni atm_core
+#netatm/uni/uni_load.c		optional atm_uni atm_core
+#netatm/uni/uniarp.c		optional atm_uni atm_core
+#netatm/uni/uniarp_cache.c	optional atm_uni atm_core
+#netatm/uni/uniarp_input.c	optional atm_uni atm_core
+#netatm/uni/uniarp_output.c	optional atm_uni atm_core
+#netatm/uni/uniarp_timer.c	optional atm_uni atm_core
+#netatm/uni/uniarp_vcm.c		optional atm_uni atm_core
+#netatm/uni/uniip.c		optional atm_uni atm_core
+#netatm/uni/unisig_decode.c	optional atm_uni atm_core
+#netatm/uni/unisig_encode.c	optional atm_uni atm_core
+#netatm/uni/unisig_if.c		optional atm_uni atm_core
+#netatm/uni/unisig_mbuf.c	optional atm_uni atm_core
+#netatm/uni/unisig_msg.c		optional atm_uni atm_core
+#netatm/uni/unisig_print.c	optional atm_uni atm_core
+#netatm/uni/unisig_proto.c	optional atm_uni atm_core
+#netatm/uni/unisig_sigmgr_state.c optional atm_uni atm_core
+#netatm/uni/unisig_subr.c	optional atm_uni atm_core
+#netatm/uni/unisig_util.c	optional atm_uni atm_core
+#netatm/uni/unisig_vc_state.c	optional atm_uni atm_core
+#netgraph/atm/atmpif/ng_atmpif.c	optional netgraph_atm_atmpif
+#netgraph/atm/atmpif/ng_atmpif_harp.c optional netgraph_atm_atmpif
 netgraph/atm/ccatm/ng_ccatm.c	optional ngatm_ccatm \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 netgraph/atm/ng_atm.c		optional ngatm_atm
diff --git a/sys/conf/options b/sys/conf/options
index 281c40d..cd64e63 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -480,12 +480,12 @@ ZERO_COPY_SOCKETS	opt_zero.h
 TI_PRIVATE_JUMBOS	opt_ti.h
 TI_JUMBO_HDRSPLIT	opt_ti.h
 
-# ATM (HARP version)
-ATM_CORE		opt_atm.h
-ATM_IP			opt_atm.h
-ATM_SIGPVC		opt_atm.h
-ATM_SPANS		opt_atm.h
-ATM_UNI			opt_atm.h
+# ATM (HARP version) - disabled as not MPSAFE in 7.0
+#ATM_CORE		opt_atm.h
+#ATM_IP			opt_atm.h
+#ATM_SIGPVC		opt_atm.h
+#ATM_SPANS		opt_atm.h
+#ATM_UNI			opt_atm.h
 
 # XXX Conflict: # of devices vs network protocol (Native ATM).
 # This makes "atm.h" unusable.
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>
diff --git a/sys/netatm/atm_proto.c b/sys/netatm/atm_proto.c
index 0d4697b..2fffc5a 100644
--- a/sys/netatm/atm_proto.c
+++ b/sys/netatm/atm_proto.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <netatm/atm_pcb.h>
 #include <netatm/atm_var.h>
 
-NET_NEEDS_GIANT("netatm");
+#error "NET_NEEDS_GIANT"
 
 struct protosw atmsw[] = {
 {
diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls
index 8073a46..fbbd2b1 100644
--- a/usr.bin/kdump/mkioctls
+++ b/usr.bin/kdump/mkioctls
@@ -44,10 +44,11 @@ BEGIN {
 	print "#include <net/if_var.h>"
 	print "#include <net/pfvar.h>"
 	print "#include <net/route.h>"
-	print "#include <netatm/atm.h>"
-	print "#include <netatm/atm_if.h>"
-	print "#include <netatm/atm_sap.h>"
-	print "#include <netatm/atm_sys.h>"
+# Disabled in 7.0 as netatm is not MPSAFE.
+#	print "#include <netatm/atm.h>"
+#	print "#include <netatm/atm_if.h>"
+#	print "#include <netatm/atm_sap.h>"
+#	print "#include <netatm/atm_sys.h>"
 	print "#include <netinet/in.h>"
 	print "#include <netinet/ip_mroute.h>"
 	print "#include <netinet6/in6_var.h>"
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index aabfac2..867b377 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -197,9 +197,10 @@ SUBDIR=	ac \
 _sysinstall=	sysinstall
 .endif
 
-.if ${MK_ATM} != "no"
-_atm=		atm
-.endif
+# Disabled in 7.0 as netatm is not MPSAFE.
+#.if ${MK_ATM} != "no"
+#_atm=		atm
+#.endif
 
 .if ${MK_AUDIT} != "no"
 _audit= 	audit