PERFORCE change 142354 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=142354

Change 142354 by jb at freebsd3 on 2008/05/27 03:42:20

	Revert to the releng7 version plus the DTrace modules.

Affected files ...

.. //depot/projects/dtrace7/src/sys/modules/Makefile#12 edit

Differences ...

==== //depot/projects/dtrace7/src/sys/modules/Makefile#12 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/Makefile,v 1.569 2008/05/25 22:11:30 rwatson Exp $
+# $FreeBSD: src/sys/modules/Makefile,v 1.540.2.13 2008/05/09 02:20:39 weongyo Exp $
 
 .include <bsd.own.mk>
 
@@ -8,7 +8,6 @@
 	accf_data \
 	accf_http \
 	${_acpi} \
-	age \
 	${_agp} \
 	aha \
 	${_ahb} \
@@ -24,7 +23,6 @@
 	${_arcmsr} \
 	${_arcnet} \
 	${_arl} \
-	${_asmc} \
 	${_asr} \
 	ata \
 	${_ath} \
@@ -34,6 +32,7 @@
 	${_ath_rate_sample} \
 	aue \
 	${_auxio} \
+	${_awi} \
 	axe \
 	bce \
 	bfe \
@@ -64,10 +63,9 @@
 	${_cs} \
 	${_ctau} \
 	cue \
+	cxgb \
 	${_cx} \
-	cxgb \
 	${_cyclic} \
-	${_cyclic_test} \
 	dc \
 	dcons \
 	dcons_crom \
@@ -94,7 +92,9 @@
 	fxp \
 	gem \
 	geom \
+	${_harp} \
 	hatm \
+	${_hfa} \
 	hifn \
 	hme \
 	${_hptiop} \
@@ -105,6 +105,7 @@
 	${_ibcs2} \
 	${_ichwd} \
 	${_ida} \
+	${_idt} \
 	${_ie} \
 	if_bridge \
 	if_disc \
@@ -128,8 +129,8 @@
 	${_ipfilter} \
 	ipfw \
 	ipfw_nat \
+	ip_mroute_mod \
 	${_ipmi} \
-	ip_mroute_mod \
 	${_ips} \
 	${_ipw} \
 	${_ipwfw} \
@@ -138,11 +139,8 @@
 	ispfw \
 	${_iwi} \
 	${_iwifw} \
-	${_iwn} \
-	${_iwnfw} \
 	${_ixgb} \
 	joy \
-	${_k8temp} \
 	kbdmux \
 	krpc \
 	kue \
@@ -197,11 +195,11 @@
 	${_nsp} \
 	ntfs \
 	ntfs_iconv \
+	${_nxge} \
 	nullfs \
 	${_nve} \
 	${_nvram} \
 	${_nwfs} \
-	${_nxge} \
 	${_oltr} \
 	${_opensolaris} \
 	${_padlock} \
@@ -228,7 +226,6 @@
 	${_ray} \
 	rc \
 	rc4 \
-	${_rdma} \
 	re \
 	reiserfs \
 	rl \
@@ -313,10 +310,11 @@
 	wb \
 	${_wi} \
 	wlan \
+	wlan_scan_ap \
+	wlan_scan_sta \
 	wlan_acl \
 	wlan_amrr \
 	wlan_ccmp \
-	wlan_rssadapt \
 	wlan_tkip \
 	wlan_wep \
 	wlan_xauth \
@@ -338,6 +336,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
@@ -375,6 +378,7 @@
 _ath_rate_amrr=	ath_rate_amrr
 _ath_rate_onoe=	ath_rate_onoe
 _ath_rate_sample=ath_rate_sample
+_awi=		awi
 _bktr=		bktr
 _cardbus=	cardbus
 _cbb=		cbb
@@ -385,7 +389,6 @@
 _cs=		cs
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 _cyclic=	cyclic
-_cyclic_test=	cyclic_test
 .endif
 _digi=		digi
 _drm=		drm
@@ -399,6 +402,8 @@
 _exca=		exca
 _ext2fs=	ext2fs
 _fe=		fe
+# Disabled due to non-MPSAFEty in 7.0
+#_hfa=		hfa
 _i2c=		i2c
 _ibcs2=		ibcs2
 _ie=		ie
@@ -427,7 +432,6 @@
 _pecoff=	pecoff
 _pst=		pst
 _ray=		ray
-_rdma=		rdma
 _safe=		safe
 _sbni=		sbni
 _scsi_low=	scsi_low
@@ -440,7 +444,7 @@
 _sr=		sr
 _stg=		stg
 _streams=	streams
-_tmpfs=		tmpfs
+_tmpfs= 	tmpfs
 _wi=		wi
 _xe=		xe
 .if ${MK_ZFS} != "no" || defined(ALL_MODULES)
@@ -452,7 +456,6 @@
 _ahb=		ahb
 _arcmsr=	arcmsr
 _arl=		arl
-_asmc=		asmc
 _asr=		asr
 _bios=		bios
 _ciss=		ciss
@@ -468,6 +471,8 @@
 _hptrr=		hptrr
 _ichwd=		ichwd
 _ida=		ida
+# Disabled due to non-MPSAFEty in 7.0
+#_idt=		idt
 _iir=		iir
 _ipmi=		ipmi
 _ips=		ips
@@ -475,9 +480,7 @@
 _ipwfw=		ipwfw
 _iwi=		iwi
 _iwifw=		iwifw
-_iwn=		iwn
-_iwnfw=		iwnfw
-_ixgb=		ixgb
+_ixgb=   	ixgb
 _mly=		mly
 _nfe=		nfe
 _nve=		nve
@@ -507,7 +510,6 @@
 _agp=		agp
 _an=		an
 _arcmsr=	arcmsr
-_asmc=		asmc
 _ath=		ath
 _ath_hal=	ath_hal
 _ath_rate_amrr=	ath_rate_amrr
@@ -521,7 +523,6 @@
 _cpufreq=	cpufreq
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 _cyclic=	cyclic
-_cyclic_test=	cyclic_test
 .endif
 _digi=		digi
 _drm=		drm
@@ -546,10 +547,7 @@
 _ips=		ips
 _ipw=		ipw
 _ipwfw=		ipwfw
-_iwn=		iwn
-_iwnfw=		iwnfw
-_ixgb=		ixgb
-_k8temp=	k8temp
+_ixgb=   	ixgb
 _linprocfs=	linprocfs
 _linsysfs=	linsysfs
 _linux=		linux
@@ -563,14 +561,13 @@
 _opensolaris=	opensolaris
 .endif
 _pccard=	pccard
-_rdma=		rdma	
 _safe=		safe
 _scsi_low=	scsi_low
 _smbfs=		smbfs
 _sound=		sound
 _speaker=	speaker
 _sppp=		sppp
-_tmpfs=		tmpfs
+_tmpfs= 	tmpfs
 _twa=		twa
 _wi=		wi
 _wpi=		wpi
@@ -587,9 +584,9 @@
 # acpi is not enabled because it is broken as a module on ia64
 _aic=		aic
 #_ar=		ar	not 64-bit clean
-_an=		an
 _arcnet=	arcnet
 _asr=		asr
+_an=		an
 _bktr=		bktr
 _cardbus=	cardbus
 _cbb=		cbb
@@ -602,6 +599,7 @@
 _ep=		ep
 _exca=		exca
 _fe=		fe
+_hfa=		hfa
 _igb=		igb
 _iir=		iir
 _mly=		mly