HEADS UP: netatm disabling taking place shortly
Robert Watson
rwatson at FreeBSD.org
Sat Jul 14 21:52:40 UTC 2007
On Sat, 14 Jul 2007, Robert Watson wrote:
> This is a warning to CVS HEAD users -- per countless previous e-mail
> threads, I will shortly be committing a patch to disable the build of
> netatm. As you may well know from earlier e-mails, netatm is one of three
> ATM stacks in the FreeBSD CVS repository, and currently the only one that is
> not MPSAFE. We will be disabling the build of netatm in 7.0, but continuing
> to ship source code so that efforts to make it MPSAFE are made easier. If
> we don't have MPSAFEty work done in the next few months, we can remove the
> source code from 7.x/8.x. I will send out a reversion patch that may be
> applied with "patch -R" to re-enable the netatm build once the final patch
> is committed.
This patch has now been committed. The commit message is below, and a patch
for use with "patch -R" is attached. An updated NET_NEEDS_GIANT patch will
likely be sent out tonight or tomorrow.
rwatson 2007-07-14 21:49:24 UTC
FreeBSD src repository
Modified files:
etc/mtree BSD.include.dist BSD.usr.dist
include Makefile
lib Makefile
rescue/rescue Makefile
sbin/atm Makefile
share/examples Makefile
sys/conf NOTES files options
sys/modules Makefile
sys/modules/netgraph/atm Makefile
sys/netatm atm_proto.c
usr.bin/kdump mkioctls
usr.sbin Makefile
Log:
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)
Revision Changes Path
1.118 +11 -10 src/etc/mtree/BSD.include.dist
1.327 +3 -2 src/etc/mtree/BSD.usr.dist
1.274 +3 -2 src/include/Makefile
1.222 +2 -1 src/lib/Makefile
1.56 +4 -2 src/rescue/rescue/Makefile
1.6 +6 -4 src/sbin/atm/Makefile
1.51 +14 -10 src/share/examples/Makefile
1.1444 +9 -7 src/sys/conf/NOTES
1.1238 +103 -99 src/sys/conf/files
1.602 +6 -6 src/sys/conf/options
1.536 +10 -3 src/sys/modules/Makefile
1.7 +3 -1 src/sys/modules/netgraph/atm/Makefile
1.16 +1 -1 src/sys/netatm/atm_proto.c
1.39 +5 -4 src/usr.bin/kdump/mkioctls
1.370 +4 -3 src/usr.sbin/Makefile
Robert N M Watson
Computer Laboratory
University of Cambridge
-------------- next part --------------
Index: etc/mtree/BSD.include.dist
===================================================================
RCS file: /zoo/cvsup/FreeBSD-CVS/src/etc/mtree/BSD.include.dist,v
retrieving revision 1.117
diff -u -r1.117 BSD.include.dist
--- etc/mtree/BSD.include.dist 6 Jul 2007 07:20:59 -0000 1.117
+++ etc/mtree/BSD.include.dist 11 Jul 2007 14:39:39 -0000
@@ -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
..
Index: etc/mtree/BSD.usr.dist
===================================================================
RCS file: /zoo/cvsup/FreeBSD-CVS/src/etc/mtree/BSD.usr.dist,v
retrieving revision 1.326
diff -u -r1.326 BSD.usr.dist
--- etc/mtree/BSD.usr.dist 2 Mar 2007 14:56:14 -0000 1.326
+++ etc/mtree/BSD.usr.dist 11 Jul 2007 14:40:18 -0000
@@ -187,8 +187,9 @@
..
IPv6
..
- atm
- ..
+# Disabled in 7.0 as netatm is not MPSAFE.
+# atm
+# ..
bc
..
bootforth
Index: include/Makefile
===================================================================
RCS file: /zoo/cvsup/FreeBSD-CVS/src/include/Makefile,v
retrieving revision 1.273
diff -u -r1.273 Makefile
--- include/Makefile 6 Jul 2007 07:20:59 -0000 1.273
+++ include/Makefile 10 Jul 2007 23:46:06 -0000
@@ -36,10 +36,11 @@
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 @@
${_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
Index: lib/Makefile
===================================================================
RCS file: /zoo/cvsup/FreeBSD-CVS/src/lib/Makefile,v
retrieving revision 1.221
diff -u -r1.221 Makefile
--- lib/Makefile 19 May 2007 04:55:14 -0000 1.221
+++ lib/Makefile 10 Jul 2007 20:09:59 -0000
@@ -48,7 +48,8 @@
.endif
.if ${MK_ATM} != "no"
-_libatm= libatm
+# Disabled in 7.0 as netatm is not MPSAFE.
+#_libatm= libatm
_libngatm= libngatm
.endif
Index: rescue/rescue/Makefile
===================================================================
RCS file: /zoo/cvsup/FreeBSD-CVS/src/rescue/rescue/Makefile,v
retrieving revision 1.55
diff -u -r1.55 Makefile
--- rescue/rescue/Makefile 25 Jun 2007 05:06:53 -0000 1.55
+++ rescue/rescue/Makefile 10 Jul 2007 20:10:14 -0000
@@ -119,8 +119,10 @@
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"
Index: sbin/atm/Makefile
===================================================================
RCS file: /zoo/cvsup/FreeBSD-CVS/src/sbin/atm/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- sbin/atm/Makefile 18 Aug 2003 15:32:16 -0000 1.5
+++ sbin/atm/Makefile 10 Jul 2007 20:10:26 -0000
@@ -23,9 +23,11 @@
# @(#) $Id: Makefile,v 1.5 1998/07/10 16:01:58 jpt Exp $
# $FreeBSD: src/sbin/atm/Makefile,v 1.5 2003/08/18 15:32:16 obrien Exp $
-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>
Index: share/examples/Makefile
===================================================================
RCS file: /zoo/cvsup/FreeBSD-CVS/src/share/examples/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- share/examples/Makefile 24 Apr 2007 16:58:54 -0000 1.50
+++ share/examples/Makefile 11 Jul 2007 10:36:26 -0000
@@ -7,7 +7,6 @@
LDIRS= BSD_daemon \
FreeBSD_version \
IPv6 \
- atm \
bootforth \
cvsup \
diskless \
@@ -35,6 +34,9 @@
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 @@
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 @@
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=
Index: sys/conf/NOTES
===================================================================
RCS file: /zoo/cvsup/FreeBSD-CVS/src/sys/conf/NOTES,v
retrieving revision 1.1441
diff -u -r1.1441 NOTES
--- sys/conf/NOTES 5 Jul 2007 15:33:13 -0000 1.1441
+++ sys/conf/NOTES 6 Jul 2007 12:52:19 -0000
@@ -899,6 +899,8 @@
#
# 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.
#
@@ -917,14 +919,14 @@
#
# 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
#####################################################################
Index: sys/conf/files
===================================================================
RCS file: /zoo/cvsup/FreeBSD-CVS/src/sys/conf/files,v
retrieving revision 1.1234
diff -u -r1.1234 files
--- sys/conf/files 5 Jul 2007 15:28:59 -0000 1.1234
+++ sys/conf/files 6 Jul 2007 12:52:19 -0000
@@ -666,28 +666,28 @@
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
@@ -1650,88 +1650,92 @@
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
Index: sys/conf/options
===================================================================
RCS file: /zoo/cvsup/FreeBSD-CVS/src/sys/conf/options,v
retrieving revision 1.600
diff -u -r1.600 options
--- sys/conf/options 6 Jul 2007 13:20:43 -0000 1.600
+++ sys/conf/options 7 Jul 2007 13:12:53 -0000
@@ -481,12 +481,12 @@
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.
Index: sys/modules/Makefile
===================================================================
RCS file: /zoo/cvsup/FreeBSD-CVS/src/sys/modules/Makefile,v
retrieving revision 1.535
diff -u -r1.535 Makefile
--- sys/modules/Makefile 30 Jun 2007 04:35:34 -0000 1.535
+++ sys/modules/Makefile 10 Jul 2007 20:10:48 -0000
@@ -88,7 +88,7 @@
fxp \
${_gem} \
geom \
- harp \
+ ${_harp} \
hatm \
${_hfa} \
hifn \
@@ -321,6 +321,11 @@
_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 @@
_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 @@
_hptmv= hptmv
_ichwd= ichwd
_ida= ida
-_idt= idt
+# Disabled due to non-MPSAFEty in 7.0
+#_idt= idt
_iir= iir
_ipmi= ipmi
_ips= ips
Index: sys/modules/netgraph/atm/Makefile
===================================================================
RCS file: /zoo/cvsup/FreeBSD-CVS/src/sys/modules/netgraph/atm/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- sys/modules/netgraph/atm/Makefile 18 Feb 2006 23:49:27 -0000 1.6
+++ sys/modules/netgraph/atm/Makefile 4 Jul 2007 07:58:17 -0000
@@ -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>
Index: sys/netatm/atm_proto.c
===================================================================
RCS file: /zoo/cvsup/FreeBSD-CVS/src/sys/netatm/atm_proto.c,v
retrieving revision 1.15
diff -u -r1.15 atm_proto.c
--- sys/netatm/atm_proto.c 1 Apr 2006 15:15:03 -0000 1.15
+++ sys/netatm/atm_proto.c 10 Jul 2007 20:11:07 -0000
@@ -51,7 +51,7 @@
#include <netatm/atm_pcb.h>
#include <netatm/atm_var.h>
-NET_NEEDS_GIANT("netatm");
+#error "NET_NEEDS_GIANT"
struct protosw atmsw[] = {
{
Index: usr.bin/kdump/mkioctls
===================================================================
RCS file: /zoo/cvsup/FreeBSD-CVS/src/usr.bin/kdump/mkioctls,v
retrieving revision 1.38
diff -u -r1.38 mkioctls
--- usr.bin/kdump/mkioctls 5 Jun 2006 10:06:51 -0000 1.38
+++ usr.bin/kdump/mkioctls 11 Jul 2007 01:50:04 -0000
@@ -44,10 +44,11 @@
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>"
Index: usr.sbin/Makefile
===================================================================
RCS file: /zoo/cvsup/FreeBSD-CVS/src/usr.sbin/Makefile,v
retrieving revision 1.369
diff -u -r1.369 Makefile
--- usr.sbin/Makefile 3 Jul 2007 12:46:07 -0000 1.369
+++ usr.sbin/Makefile 10 Jul 2007 20:11:22 -0000
@@ -197,9 +197,10 @@
_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
More information about the freebsd-current
mailing list