Date: Sun, 25 May 2008 22:25:28 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 142278 for review Message-ID: <200805252225.m4PMPShX052701@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=142278 Change 142278 by jb@freebsd3 on 2008/05/25 22:24:30 IFC Affected files ... .. //depot/projects/dtrace/src/sys/Makefile#13 integrate .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#7 integrate .. //depot/projects/dtrace/src/sys/conf/NOTES#56 integrate .. //depot/projects/dtrace/src/sys/conf/files#92 integrate .. //depot/projects/dtrace/src/sys/conf/options#53 integrate .. //depot/projects/dtrace/src/sys/dev/harp/if_harp.c#4 delete .. //depot/projects/dtrace/src/sys/dev/hfa/fore.h#4 delete .. //depot/projects/dtrace/src/sys/dev/hfa/fore_aali.h#4 delete .. //depot/projects/dtrace/src/sys/dev/hfa/fore_buffer.c#4 delete .. //depot/projects/dtrace/src/sys/dev/hfa/fore_command.c#4 delete .. //depot/projects/dtrace/src/sys/dev/hfa/fore_globals.c#4 delete .. //depot/projects/dtrace/src/sys/dev/hfa/fore_if.c#4 delete .. //depot/projects/dtrace/src/sys/dev/hfa/fore_include.h#4 delete .. //depot/projects/dtrace/src/sys/dev/hfa/fore_init.c#4 delete .. //depot/projects/dtrace/src/sys/dev/hfa/fore_intr.c#4 delete .. //depot/projects/dtrace/src/sys/dev/hfa/fore_output.c#4 delete .. //depot/projects/dtrace/src/sys/dev/hfa/fore_receive.c#4 delete .. //depot/projects/dtrace/src/sys/dev/hfa/fore_slave.h#4 delete .. //depot/projects/dtrace/src/sys/dev/hfa/fore_stats.c#4 delete .. //depot/projects/dtrace/src/sys/dev/hfa/fore_stats.h#4 delete .. //depot/projects/dtrace/src/sys/dev/hfa/fore_timer.c#4 delete .. //depot/projects/dtrace/src/sys/dev/hfa/fore_transmit.c#4 delete .. //depot/projects/dtrace/src/sys/dev/hfa/fore_var.h#4 delete .. //depot/projects/dtrace/src/sys/dev/hfa/fore_vcm.c#4 delete .. //depot/projects/dtrace/src/sys/dev/hfa/hfa_eisa.c#4 delete .. //depot/projects/dtrace/src/sys/dev/hfa/hfa_freebsd.c#4 delete .. //depot/projects/dtrace/src/sys/dev/hfa/hfa_freebsd.h#4 delete .. //depot/projects/dtrace/src/sys/dev/hfa/hfa_pci.c#5 delete .. //depot/projects/dtrace/src/sys/dev/hfa/hfa_sbus.c#4 delete .. //depot/projects/dtrace/src/sys/dev/idt/idt.c#5 delete .. //depot/projects/dtrace/src/sys/dev/idt/idt_harp.c#4 delete .. //depot/projects/dtrace/src/sys/dev/idt/idt_pci.c#6 delete .. //depot/projects/dtrace/src/sys/dev/idt/idtreg.h#5 delete .. //depot/projects/dtrace/src/sys/dev/idt/idtvar.h#4 delete .. //depot/projects/dtrace/src/sys/kern/Make.tags.inc#6 integrate .. //depot/projects/dtrace/src/sys/modules/Makefile#46 integrate .. //depot/projects/dtrace/src/sys/modules/harp/Makefile#4 delete .. //depot/projects/dtrace/src/sys/modules/hfa/Makefile#5 delete .. //depot/projects/dtrace/src/sys/modules/hfa/Makefile.inc#4 delete .. //depot/projects/dtrace/src/sys/modules/hfa/eisa/Makefile#4 delete .. //depot/projects/dtrace/src/sys/modules/hfa/hfa/Makefile#4 delete .. //depot/projects/dtrace/src/sys/modules/hfa/pci/Makefile#4 delete .. //depot/projects/dtrace/src/sys/modules/hfa/sbus/Makefile#4 delete .. //depot/projects/dtrace/src/sys/modules/idt/Makefile#4 delete .. //depot/projects/dtrace/src/sys/modules/netgraph/atm/Makefile#5 integrate .. //depot/projects/dtrace/src/sys/modules/netgraph/atm/atmpif/Makefile#4 delete .. //depot/projects/dtrace/src/sys/netatm/atm.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/atm_aal5.c#5 delete .. //depot/projects/dtrace/src/sys/netatm/atm_cm.c#5 delete .. //depot/projects/dtrace/src/sys/netatm/atm_cm.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/atm_device.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/atm_if.c#5 delete .. //depot/projects/dtrace/src/sys/netatm/atm_if.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/atm_ioctl.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/atm_pcb.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/atm_proto.c#5 delete .. //depot/projects/dtrace/src/sys/netatm/atm_sap.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/atm_sigmgr.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/atm_signal.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/atm_socket.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/atm_stack.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/atm_subr.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/atm_sys.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/atm_usrreq.c#6 delete .. //depot/projects/dtrace/src/sys/netatm/atm_var.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/atm_vc.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/ipatm/ipatm.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/ipatm/ipatm_event.c#5 delete .. //depot/projects/dtrace/src/sys/netatm/ipatm/ipatm_if.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/ipatm/ipatm_input.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/ipatm/ipatm_load.c#5 delete .. //depot/projects/dtrace/src/sys/netatm/ipatm/ipatm_output.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/ipatm/ipatm_serv.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/ipatm/ipatm_usrreq.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/ipatm/ipatm_var.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/ipatm/ipatm_vcm.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/port.h#5 delete .. //depot/projects/dtrace/src/sys/netatm/queue.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/sigpvc/sigpvc_if.c#5 delete .. //depot/projects/dtrace/src/sys/netatm/sigpvc/sigpvc_subr.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/sigpvc/sigpvc_var.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/spans/spans_arp.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/spans/spans_cls.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/spans/spans_cls.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/spans/spans_if.c#5 delete .. //depot/projects/dtrace/src/sys/netatm/spans/spans_kxdr.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/spans/spans_kxdr.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/spans/spans_msg.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/spans/spans_print.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/spans/spans_proto.c#5 delete .. //depot/projects/dtrace/src/sys/netatm/spans/spans_subr.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/spans/spans_util.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/spans/spans_var.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/spans/spans_xdr.x#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/q2110_sigaa.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/q2110_sigcpcs.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/q2110_subr.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/qsaal1_sigaa.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/qsaal1_sigcpcs.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/qsaal1_subr.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/sscf_uni.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/sscf_uni.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/sscf_uni_lower.c#5 delete .. //depot/projects/dtrace/src/sys/netatm/uni/sscf_uni_upper.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/sscf_uni_var.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/sscop.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/sscop.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/sscop_lower.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/sscop_misc.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/sscop_pdu.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/sscop_pdu.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/sscop_sigaa.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/sscop_sigcpcs.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/sscop_subr.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/sscop_timer.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/sscop_upper.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/sscop_var.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/uni.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/uni_load.c#5 delete .. //depot/projects/dtrace/src/sys/netatm/uni/uniarp.c#5 delete .. //depot/projects/dtrace/src/sys/netatm/uni/uniarp_cache.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/uniarp_input.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/uniarp_output.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/uniarp_timer.c#5 delete .. //depot/projects/dtrace/src/sys/netatm/uni/uniarp_vcm.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/uniip.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/uniip_var.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/unisig.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/unisig_decode.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/unisig_decode.h#5 delete .. //depot/projects/dtrace/src/sys/netatm/uni/unisig_encode.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/unisig_if.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/unisig_mbuf.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/unisig_mbuf.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/unisig_msg.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/unisig_msg.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/unisig_print.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/unisig_print.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/unisig_proto.c#5 delete .. //depot/projects/dtrace/src/sys/netatm/uni/unisig_sigmgr_state.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/unisig_subr.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/unisig_util.c#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/unisig_var.h#4 delete .. //depot/projects/dtrace/src/sys/netatm/uni/unisig_vc_state.c#4 delete .. //depot/projects/dtrace/src/sys/netgraph/atm/atmpif/ng_atmpif.c#4 delete .. //depot/projects/dtrace/src/sys/netgraph/atm/atmpif/ng_atmpif_harp.c#4 delete .. //depot/projects/dtrace/src/sys/netgraph/atm/atmpif/ng_atmpif_var.h#4 delete .. //depot/projects/dtrace/src/sys/netgraph/atm/ng_atmpif.h#4 delete Differences ... ==== //depot/projects/dtrace/src/sys/Makefile#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.47 2008/05/21 07:56:10 obrien Exp $ +# $FreeBSD: src/sys/Makefile,v 1.48 2008/05/25 22:11:27 rwatson Exp $ .include <bsd.own.mk> @@ -9,7 +9,7 @@ # Directories to include in cscope name file and TAGS. CSCOPEDIRS= boot bsm cam compat conf contrib crypto ddb dev fs gdb geom \ - gnu i4b isa kern libkern modules net net80211 netatalk netatm \ + gnu i4b isa kern libkern modules net net80211 netatalk \ netgraph netinet netinet6 netipsec netipx netnatm netncp \ netsmb nfs nfs4client nfsclient nfsserver opencrypto pccard \ pci rpc security sys ufs vm ${ARCHDIR} ==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#7 (text) ==== @@ -3277,11 +3277,13 @@ /* XXX - need to use dtrace_canload() and dtrace_loadptr() */ m.mx = tupregs[0].dttk_value; +#ifdef DOODAD if (LO_CLASSINDEX(&(m.mi->lock_object)) < 2) { regs[rd] = !(m.mi->mtx_lock & MTX_UNOWNED); } else { regs[rd] = !(m.mi->mtx_lock & SX_UNLOCKED); } +#endif break; case DIF_SUBR_MUTEX_OWNER: ==== //depot/projects/dtrace/src/sys/conf/NOTES#56 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1490 2008/05/23 22:17:28 jb Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1491 2008/05/25 22:11:27 rwatson Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -910,38 +910,6 @@ # 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 ==== //depot/projects/dtrace/src/sys/conf/files#92 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1301 2008/05/19 01:53:47 yongari Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1302 2008/05/25 22:11:27 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -667,28 +667,11 @@ 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 @@ -1892,92 +1875,6 @@ 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 ==== //depot/projects/dtrace/src/sys/conf/options#53 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.630 2008/05/18 19:28:51 jb Exp $ +# $FreeBSD: src/sys/conf/options,v 1.631 2008/05/25 22:11:27 rwatson Exp $ # # On the handling of kernel options # @@ -497,13 +497,6 @@ 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 ==== //depot/projects/dtrace/src/sys/kern/Make.tags.inc#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/kern/Make.tags.inc,v 1.20 2007/07/05 08:55:14 bz Exp $ +# $FreeBSD: src/sys/kern/Make.tags.inc,v 1.21 2008/05/25 22:11:29 rwatson Exp $ # @(#)Make.tags.inc 8.1 (Berkeley) 6/11/93 SYS?= ${.CURDIR}/.. @@ -41,7 +41,6 @@ ${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 @@ ${SYS}/kern \ ${SYS}/net \ ${SYS}/netatalk \ - ${SYS}/netatm \ ${SYS}/netinet \ ${SYS}/netinet6 \ ${SYS}/netipsec \ ==== //depot/projects/dtrace/src/sys/modules/Makefile#46 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.568 2008/05/23 22:36:12 jb Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.569 2008/05/25 22:11:30 rwatson Exp $ .include <bsd.own.mk> @@ -94,9 +94,7 @@ fxp \ gem \ geom \ - ${_harp} \ hatm \ - ${_hfa} \ hifn \ hme \ ${_hptiop} \ @@ -107,7 +105,6 @@ ${_ibcs2} \ ${_ichwd} \ ${_ida} \ - ${_idt} \ ${_ie} \ if_bridge \ if_disc \ @@ -341,11 +338,6 @@ _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 @@ -407,8 +399,6 @@ _exca= exca _ext2fs= ext2fs _fe= fe -# Disabled due to non-MPSAFEty in 7.0 -#_hfa= hfa _i2c= i2c _ibcs2= ibcs2 _ie= ie @@ -478,8 +468,6 @@ _hptrr= hptrr _ichwd= ichwd _ida= ida -# Disabled due to non-MPSAFEty in 7.0 -#_idt= idt _iir= iir _ipmi= ipmi _ips= ips @@ -614,7 +602,6 @@ _ep= ep _exca= exca _fe= fe -_hfa= hfa _igb= igb _iir= iir _mly= mly ==== //depot/projects/dtrace/src/sys/modules/netgraph/atm/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/netgraph/atm/Makefile,v 1.7 2007/07/14 21:49:23 rwatson Exp $ +# $FreeBSD: src/sys/modules/netgraph/atm/Makefile,v 1.8 2008/05/25 22:11:31 rwatson Exp $ SUBDIR= \ atm \ @@ -8,7 +8,4 @@ sscop \ uni -# atmpif disabled due to non-MPSAFEty in 7.0 -# atmpif \ - .include <bsd.subdir.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200805252225.m4PMPShX052701>