PERFORCE change 134418 for review

[John Birrell]

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

Change 134418 by jb at jb_freebsd1 on 2008/01/29 22:22:28

	Manual merge from the dtrace project.

Affected files ...

.. //depot/projects/dtrace7/src/sys/modules/Makefile#4 integrate
.. //depot/projects/dtrace7/src/sys/modules/zfs/Makefile#3 integrate

Differences ...

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

@@ -23,6 +23,7 @@
 	${_arcmsr} \
 	${_arcnet} \
 	${_arl} \
+	${_asmc} \
 	${_asr} \
 	ata \
 	${_ath} \
@@ -64,6 +65,9 @@
 	cue \
 	cxgb \
 	${_cx} \
+	cxgb \
+	${_cyclic} \
+	${_cyclic_test} \
 	dc \
 	dcons \
 	dcons_crom \
@@ -71,6 +75,7 @@
 	${_digi} \
 	${_dpt} \
 	${_drm} \
+	${_dtrace} \
 	dummynet \
 	${_ed} \
 	${_elink} \
@@ -124,8 +129,8 @@
 	ipdivert \
 	${_ipfilter} \
 	ipfw \
+	${_ipmi} \
 	ip_mroute_mod \
-	${_ipmi} \
 	${_ips} \
 	${_ipw} \
 	${_ipwfw} \
@@ -192,7 +197,9 @@
 	${_nve} \
 	${_nvram} \
 	${_nwfs} \
+	${_nxge} \
 	${_oltr} \
+	${_opensolaris} \
 	${_padlock} \
 	patm \
 	${_pccard} \
@@ -306,6 +313,8 @@
 	wlan_acl \
 	wlan_amrr \
 	wlan_ccmp \
+	wlan_scan_ap \
+	wlan_scan_sta \
 	wlan_tkip \
 	wlan_wep \
 	wlan_xauth \
@@ -378,8 +387,15 @@
 _cp=		cp
 _cpufreq=	cpufreq
 _cs=		cs
+.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
+_cyclic=	cyclic
+_cyclic_test=	cyclic_test
+.endif
 _digi=		digi
 _drm=		drm
+.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
+_dtrace=	dtrace
+.endif
 _ed=		ed
 _elink=		elink
 _em=		em
@@ -408,6 +424,9 @@
 _nwfs=		nwfs
 .endif
 _oltr=		oltr
+.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
+_opensolaris=	opensolaris
+.endif
 _pccard=	pccard
 _pcfclock=	pcfclock
 _pecoff=	pecoff
@@ -425,7 +444,7 @@
 _sr=		sr
 _stg=		stg
 _streams=	streams
-_tmpfs= 	tmpfs
+_tmpfs=		tmpfs
 _wi=		wi
 _xe=		xe
 .if ${MK_ZFS} != "no" || defined(ALL_MODULES)
@@ -437,6 +456,7 @@
 _ahb=		ahb
 _arcmsr=	arcmsr
 _arl=		arl
+_asmc=		asmc
 _asr=		asr
 _bios=		bios
 _ciss=		ciss
@@ -491,6 +511,7 @@
 _agp=		agp
 _an=		an
 _arcmsr=	arcmsr
+_asmc=		asmc
 _ath=		ath
 _ath_hal=	ath_hal
 _ath_rate_amrr=	ath_rate_amrr
@@ -501,8 +522,15 @@
 _ciss=		ciss
 _coretemp=	coretemp
 _cpufreq=	cpufreq
+.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
+_cyclic=	cyclic
+_cyclic_test=	cyclic_test
+.endif
 _digi=		digi
 _drm=		drm
+.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
+_dtrace=	dtrace
+.endif
 _ed=		ed
 _em=		em
 _exca=		exca
@@ -530,6 +558,9 @@
 _nve=		nve
 _nvram=		nvram
 _nxge=		nxge
+.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
+_opensolaris=	opensolaris
+.endif
 _pccard=	pccard
 _rr232x=	rr232x
 _safe=		safe
@@ -555,9 +586,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

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

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/zfs/Makefile,v 1.6 2007/06/08 12:35:47 pjd Exp $
+# $FreeBSD: src/sys/modules/zfs/Makefile,v 1.7 2007/11/28 22:58:09 jb Exp $
 
 KMOD=	zfs
 
@@ -12,7 +12,6 @@
 SRCS+=	nvpair.c
 
 .PATH:	${.CURDIR}/../../compat/opensolaris/kern
-SRCS+=	opensolaris_kmem.c
 SRCS+=	opensolaris_kobj.c
 SRCS+=	opensolaris_kstat.c
 SRCS+=	opensolaris_misc.c
@@ -21,14 +20,6 @@
 SRCS+=	opensolaris_vfs.c
 SRCS+=	opensolaris_zone.c
 
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64"
-.PATH:	${.CURDIR}/../../contrib/opensolaris/common/atomic/${MACHINE_ARCH}
-SRCS+=	atomic.S
-.else
-.PATH:	${.CURDIR}/../../compat/opensolaris/kern
-SRCS+=	opensolaris_atomic.c
-.endif
-
 .PATH:	${.CURDIR}/../../contrib/opensolaris/uts/common/fs
 SRCS+=	gfs.c