This is an FYI rather than a HEADS UP, as it should make no functional
difference (ideally). Per e-mail a couple of weeks ago, I have removed the
uncompilable and unusable netatm code from the 7.x source tree. We are now
down to two (2) ATM stacks in 7.x, both of which are MPSAFE and work, as
opposed to netatm.
Thanks,
Robert N M Watson
Computer Laboratory
University of Cambridge
---------
Author: rwatson
Date: Sun Aug 31 10:15:43 2008
New Revision: 182526
URL: http://svn.freebsd.org/changeset/base/182526
Log:
Merge r179308 from head to stable/7:
Remove netatm from HEAD as it is not MPSAFE and relies on the now removed
NET_NEEDS_GIANT. netatm has been disconnected from the build for ten
months in HEAD/RELENG_7. Specifics:
- netatm include files
- netatm command line management tools
- libatm
- ATM parts in rescue and sysinstall
- sample configuration files and documents
- kernel support as a module or in NOTES
- netgraph wrapper nodes for netatm
- ctags data for netatm.
- netatm-specific device drivers.
Reviewed by: bz
Discussed with: bms, bz, harti
MFC discussed with: des, peter
Deleted:
stable/7/lib/libatm/
stable/7/sbin/atm/atm/
stable/7/sbin/atm/fore_dnld/
stable/7/sbin/atm/ilmid/
stable/7/share/examples/atm/
stable/7/share/man/man4/ng_atmpif.4
stable/7/sys/dev/harp/
stable/7/sys/dev/hfa/
stable/7/sys/dev/idt/
stable/7/sys/modules/harp/
stable/7/sys/modules/hfa/
stable/7/sys/modules/idt/
stable/7/sys/modules/netgraph/atm/atmpif/
stable/7/sys/netatm/
stable/7/sys/netgraph/atm/atmpif/
stable/7/sys/netgraph/atm/ng_atmpif.h
stable/7/usr.sbin/atm/
Modified:
stable/7/etc/ (props changed)
stable/7/etc/mtree/BSD.include.dist
stable/7/etc/mtree/BSD.usr.dist
stable/7/include/ (props changed)
stable/7/include/Makefile
stable/7/lib/ (props changed)
stable/7/lib/Makefile
stable/7/lib/csu/ (props changed)
stable/7/lib/libbluetooth/ (props changed)
stable/7/lib/libc/ (props changed)
stable/7/lib/libc/sys/ (props changed)
stable/7/lib/libdisk/ (props changed)
stable/7/lib/libftpio/ (props changed)
stable/7/lib/libgeom/ (props changed)
stable/7/lib/libkvm/ (props changed)
stable/7/lib/libutil/ (props changed)
stable/7/rescue/ (props changed)
stable/7/rescue/rescue/Makefile
stable/7/sbin/ (props changed)
stable/7/sbin/atacontrol/ (props changed)
stable/7/sbin/atm/Makefile
stable/7/sbin/devfs/ (props changed)
stable/7/sbin/fdisk/ (props changed)
stable/7/sbin/geom/ (props changed)
stable/7/sbin/ifconfig/ (props changed)
stable/7/sbin/ipfw/ (props changed)
stable/7/sbin/mdconfig/ (props changed)
stable/7/sbin/mksnap_ffs/ (props changed)
stable/7/sbin/mount/ (props changed)
stable/7/sbin/ping6/ (props changed)
stable/7/sbin/sconfig/ (props changed)
stable/7/share/examples/ (props changed)
stable/7/share/examples/Makefile
stable/7/share/man/man4/ (props changed)
stable/7/share/man/man4/Makefile
stable/7/share/man/man7/ (props changed)
stable/7/share/man/man7/hier.7
stable/7/sys/ (props changed)
stable/7/sys/Makefile
stable/7/sys/conf/NOTES
stable/7/sys/conf/files
stable/7/sys/conf/options
stable/7/sys/kern/Make.tags.inc
stable/7/sys/modules/Makefile
stable/7/sys/modules/netgraph/atm/Makefile
stable/7/usr.bin/kdump/ (props changed)
stable/7/usr.bin/kdump/kdump.c
stable/7/usr.bin/kdump/mkioctls
stable/7/usr.sbin/ (props changed)
stable/7/usr.sbin/Makefile
stable/7/usr.sbin/adduser/ (props changed)
stable/7/usr.sbin/bsnmpd/modules/snmp_pf/ (props changed)
stable/7/usr.sbin/config/ (props changed)
stable/7/usr.sbin/cron/ (props changed)
stable/7/usr.sbin/cron/cron/ (props changed)
stable/7/usr.sbin/mountd/ (props changed)
stable/7/usr.sbin/ndiscvt/ (props changed)
stable/7/usr.sbin/newsyslog/newsyslog.conf.5 (props changed)
stable/7/usr.sbin/pkg_install/ (props changed)
stable/7/usr.sbin/pmcstat/ (props changed)
stable/7/usr.sbin/powerd/ (props changed)
stable/7/usr.sbin/pw/ (props changed)
stable/7/usr.sbin/rpc.lockd/ (props changed)
stable/7/usr.sbin/rpc.statd/ (props changed)
stable/7/usr.sbin/setfib/ (props changed)
stable/7/usr.sbin/sysinstall/ (props changed)
stable/7/usr.sbin/syslogd/ (props changed)
stable/7/usr.sbin/tzsetup/ (props changed)
stable/7/usr.sbin/wpa/wpa_supplicant/ (props changed)
Modified: stable/7/etc/mtree/BSD.include.dist
=============================================================================---
stable/7/etc/mtree/BSD.include.dist Sun Aug 31 09:45:04 2008 (r182525)
+++ stable/7/etc/mtree/BSD.include.dist Sun Aug 31 10:15:43 2008 (r182526)
@@ -211,17 +211,6 @@
..
netatalk
..
-# Disabled in 7.0 as netatm is not MPSAFE.
-# netatm
-# ipatm
-# ..
-# sigpvc
-# ..
-# spans
-# ..
-# uni
-# ..
-# ..
netgraph
atm
..
Modified: stable/7/etc/mtree/BSD.usr.dist
=============================================================================---
stable/7/etc/mtree/BSD.usr.dist Sun Aug 31 09:45:04 2008 (r182525)
+++ stable/7/etc/mtree/BSD.usr.dist Sun Aug 31 10:15:43 2008 (r182526)
@@ -189,9 +189,6 @@
..
IPv6
..
-# Disabled in 7.0 as netatm is not MPSAFE.
-# atm
-# ..
bc
..
bootforth
Modified: stable/7/include/Makefile
=============================================================================---
stable/7/include/Makefile Sun Aug 31 09:45:04 2008 (r182525)
+++ stable/7/include/Makefile Sun Aug 31 10:15:43 2008 (r182526)
@@ -40,7 +40,6 @@ LDIRS= bsm cam geom net net80211 netatal
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 \
@@ -57,7 +56,6 @@ LSUBDIRS= cam/scsi \
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
LSUBSUBDIRS= dev/mpt/mpilib
Modified: stable/7/lib/Makefile
=============================================================================---
stable/7/lib/Makefile Sun Aug 31 09:45:04 2008 (r182525)
+++ stable/7/lib/Makefile Sun Aug 31 10:15:43 2008 (r182526)
@@ -48,8 +48,6 @@ _csu=csu
.endif
.if ${MK_ATM} != "no"
-# Disabled in 7.0 as netatm is not MPSAFE.
-#_libatm= libatm
_libngatm= libngatm
.endif
Modified: stable/7/rescue/rescue/Makefile
=============================================================================---
stable/7/rescue/rescue/Makefile Sun Aug 31 09:45:04 2008 (r182525)
+++ stable/7/rescue/rescue/Makefile Sun Aug 31 10:15:43 2008 (r182526)
@@ -120,9 +120,6 @@ CRUNCH_PROGS_sbin= atacontrol badsect bs
.if ${MK_ATM} != "no"
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"
Modified: stable/7/sbin/atm/Makefile
=============================================================================---
stable/7/sbin/atm/Makefile Sun Aug 31 09:45:04 2008 (r182525)
+++ stable/7/sbin/atm/Makefile Sun Aug 31 10:15:43 2008 (r182526)
@@ -25,9 +25,4 @@
SUBDIR= atmconfig
-# Disabled in 7.0 as netatm is not MPSAFE.
-# atm \
-# fore_dnld \
-# ilmid
-
.include <bsd.subdir.mk>
Modified: stable/7/share/examples/Makefile
=============================================================================---
stable/7/share/examples/Makefile Sun Aug 31 09:45:04 2008 (r182525)
+++ stable/7/share/examples/Makefile Sun Aug 31 10:15:43 2008 (r182526)
@@ -34,9 +34,6 @@ 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 \
@@ -239,17 +236,6 @@ 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
Modified: stable/7/share/man/man4/Makefile
=============================================================================---
stable/7/share/man/man4/Makefile Sun Aug 31 09:45:04 2008 (r182525)
+++ stable/7/share/man/man4/Makefile Sun Aug 31 10:15:43 2008 (r182526)
@@ -197,7 +197,6 @@ MAN= aac.4 \
ng_atm.4 \
ngatmbase.4 \
ng_atmllc.4 \
- ng_atmpif.4 \
ng_bluetooth.4 \
ng_bpf.4 \
ng_bridge.4 \
Modified: stable/7/share/man/man7/hier.7
=============================================================================---
stable/7/share/man/man7/hier.7 Sun Aug 31 09:45:04 2008 (r182525)
+++ stable/7/share/man/man7/hier.7 Sun Aug 31 10:15:43 2008 (r182526)
@@ -306,10 +306,6 @@ machine-specific C include files
miscellaneous network C include files
.It Pa netatalk/
Appletalk protocol
-.It Pa netatm/
-ATM include files;
-see
-.Xr atm 8
.It Pa netinet/
C include files for Internet standard protocols;
see
Modified: stable/7/sys/Makefile
=============================================================================---
stable/7/sys/Makefile Sun Aug 31 09:45:04 2008 (r182525)
+++ stable/7/sys/Makefile Sun Aug 31 10:15:43 2008 (r182526)
@@ -9,7 +9,7 @@ SUBDIR= boot
# Directories to include in cscope name file and TAGS.
CSCOPEDIRS= bsm cam cddl compat conf contrib crypto ddb dev fs geom gnu \
- i4b isa kern libkern modules net net80211 netatalk netatm \
+ i4b isa kern libkern modules net net80211 netatalk \
netgraph netinet netinet6 netipsec netipx netnatm netncp \
netsmb nfs nfsclient nfs4client nlm rpc pccard pci security \
sys ufs vm xdr ${CSCOPE_ARCHDIR}
Modified: stable/7/sys/conf/NOTES
=============================================================================---
stable/7/sys/conf/NOTES Sun Aug 31 09:45:04 2008 (r182525)
+++ stable/7/sys/conf/NOTES Sun Aug 31 10:15:43 2008 (r182526)
@@ -903,38 +903,6 @@ options DUMMYNET
# zero_copy(9) for more details.
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.
-#
-# ATM_IP includes support for running IP over ATM.
-#
-# At least one (and usually only one) of the following signalling managers
-# must be included (note that all signalling managers include PVC support):
-# ATM_SIGPVC includes support for the PVC-only signalling manager `sigpvc'.
-# ATM_SPANS includes support for the `spans' signalling manager, which runs
-# the FORE Systems's proprietary SPANS signalling protocol.
-# ATM_UNI includes support for the `uni30' and `uni31' signalling
managers,
-# which run the ATM Forum UNI 3.x signalling protocols.
-#
-# The `hfa' driver provides support for the FORE Systems, Inc.
-# PCA-200E ATM PCI Adapter.
-#
-# 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
-
-#device hfa #FORE PCA-200E ATM PCI
-#device harp #Pseudo-interface for NATM
-
#####################################################################
# FILESYSTEM OPTIONS
Modified: stable/7/sys/conf/files
=============================================================================---
stable/7/sys/conf/files Sun Aug 31 09:45:04 2008 (r182525)
+++ stable/7/sys/conf/files Sun Aug 31 10:15:43 2008 (r182526)
@@ -673,28 +673,11 @@ 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/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/hifn/hifn7751.c optional hifn
dev/hme/if_hme.c optional hme
dev/hme/if_hme_pci.c optional hme pci
@@ -1704,92 +1687,6 @@ 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 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
Modified: stable/7/sys/conf/options
=============================================================================---
stable/7/sys/conf/options Sun Aug 31 09:45:04 2008 (r182525)
+++ stable/7/sys/conf/options Sun Aug 31 10:15:43 2008 (r182526)
@@ -493,13 +493,6 @@ ZERO_COPY_SOCKETS opt_zero.h
TI_PRIVATE_JUMBOS opt_ti.h
TI_JUMBO_HDRSPLIT opt_ti.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.
NATM
Modified: stable/7/sys/kern/Make.tags.inc
=============================================================================---
stable/7/sys/kern/Make.tags.inc Sun Aug 31 09:45:04 2008 (r182525)
+++ stable/7/sys/kern/Make.tags.inc Sun Aug 31 10:15:43 2008 (r182526)
@@ -41,7 +41,6 @@ COMM= ${SYS}/dev/advansys/*.[ch] \
${SYS}/kern/*.[ch] \
${SYS}/net/*.[ch] \
${SYS}/netatalk/*.[ch] \
- ${SYS}/netatm/*.[ch] \
${SYS}/netinet/*.[ch] \
${SYS}/netinet6/*.[ch] \
${SYS}/netipsec/*.[ch] \
@@ -60,7 +59,6 @@ COMMDIR1= ${SYS}/conf \
${SYS}/kern \
${SYS}/net \
${SYS}/netatalk \
- ${SYS}/netatm \
${SYS}/netinet \
${SYS}/netinet6 \
${SYS}/netipsec \
Modified: stable/7/sys/modules/Makefile
=============================================================================---
stable/7/sys/modules/Makefile Sun Aug 31 09:45:04 2008 (r182525)
+++ stable/7/sys/modules/Makefile Sun Aug 31 10:15:43 2008 (r182526)
@@ -96,9 +96,7 @@ SUBDIR= ${_3dfx} \
gem \
geom \
${_glxsb} \
- ${_harp} \
hatm \
- ${_hfa} \
hifn \
hme \
${_hptiop} \
@@ -109,7 +107,6 @@ SUBDIR= ${_3dfx} \
${_ibcs2} \
${_ichwd} \
${_ida} \
- ${_idt} \
${_ie} \
if_bridge \
if_disc \
@@ -343,11 +340,6 @@ _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
@@ -411,8 +403,6 @@ _exca= exca
_ext2fs= ext2fs
_fe= fe
_glxsb= glxsb
-# Disabled due to non-MPSAFEty in 7.0
-#_hfa= hfa
_i2c= i2c
_ibcs2= ibcs2
_ie= ie
@@ -481,8 +471,6 @@ _hptmv= hptmv
_hptrr= hptrr
_ichwd= ichwd
_ida= ida
-# Disabled due to non-MPSAFEty in 7.0
-#_idt= idt
_iir= iir
_ipmi= ipmi
_ips= ips
@@ -612,7 +600,6 @@ _em= em
_ep= ep
_exca= exca
_fe= fe
-_hfa= hfa
_igb= igb
_iir= iir
_mly= mly
Modified: stable/7/sys/modules/netgraph/atm/Makefile
=============================================================================---
stable/7/sys/modules/netgraph/atm/Makefile Sun Aug 31 09:45:04 2008 (r182525)
+++ stable/7/sys/modules/netgraph/atm/Makefile Sun Aug 31 10:15:43 2008
(r182526)
@@ -8,7 +8,4 @@ SUBDIR= \
sscop \
uni
-# atmpif disabled due to non-MPSAFEty in 7.0
-# atmpif \
-
.include <bsd.subdir.mk>
Modified: stable/7/usr.bin/kdump/kdump.c
=============================================================================---
stable/7/usr.bin/kdump/kdump.c Sun Aug 31 09:45:04 2008 (r182525)
+++ stable/7/usr.bin/kdump/kdump.c Sun Aug 31 10:15:43 2008 (r182526)
@@ -1161,8 +1161,6 @@ ktrsockaddr(struct sockaddr *sa)
{
/*
TODO: Support additional address families
- #include <netatm/atm.h>
- struct sockaddr_atm *atm;
#include <netnatm/natm.h>
struct sockaddr_natm *natm;
#include <netsmb/netbios.h>
Modified: stable/7/usr.bin/kdump/mkioctls
=============================================================================---
stable/7/usr.bin/kdump/mkioctls Sun Aug 31 09:45:04 2008 (r182525)
+++ stable/7/usr.bin/kdump/mkioctls Sun Aug 31 10:15:43 2008 (r182526)
@@ -44,11 +44,6 @@ BEGIN {
print "#include <net/if_var.h>"
print "#include <net/pfvar.h>"
print "#include <net/route.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>"
Modified: stable/7/usr.sbin/Makefile
=============================================================================---
stable/7/usr.sbin/Makefile Sun Aug 31 09:45:04 2008 (r182525)
+++ stable/7/usr.sbin/Makefile Sun Aug 31 10:15:43 2008 (r182526)
@@ -201,11 +201,6 @@ SUBDIR= ac \
_sysinstall= sysinstall
.endif
-# Disabled in 7.0 as netatm is not MPSAFE.
-#.if ${MK_ATM} != "no"
-#_atm= atm
-#.endif
-
.if ${MK_AUDIT} != "no"
_audit= audit
_auditd= auditd