[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

zrouter-src-freebsd at zrouter.org zrouter-src-freebsd at zrouter.org
Wed Jul 25 14:36:15 UTC 2012


details:   http://zrouter.org/hg/FreeBSD/head//rev/b69912b1d8df
changeset: 498:b69912b1d8df
user:      Aleksandr Rybalko <ray at ddteam.net>
date:      Wed Jul 25 16:52:06 2012 +0300
description:
Lazy update

diffstat:

 head/sys/modules/acpi/Makefile                |   4 +-
 head/sys/modules/acpi/acpi/Makefile           |  21 +++++---------
 head/sys/modules/acpi/acpi_asus_wmi/Makefile  |   9 ++++++
 head/sys/modules/aesni/Makefile               |   4 +-
 head/sys/modules/agp/Makefile                 |  14 +++++++++-
 head/sys/modules/ath/Makefile                 |   5 ++-
 head/sys/modules/cam/Makefile                 |   8 +++--
 head/sys/modules/cxgbe/Makefile               |   7 ++++-
 head/sys/modules/cxgbe/if_cxgbe/Makefile      |   4 +-
 head/sys/modules/cxgbe/tom/Makefile           |  15 ++++++++++
 head/sys/modules/drm2/Makefile                |   9 ++++++
 head/sys/modules/drm2/Makefile.inc            |   3 ++
 head/sys/modules/drm2/drm2/Makefile           |  39 +++++++++++++++++++++++++++
 head/sys/modules/drm2/i915kms/Makefile        |  34 +++++++++++++++++++++++
 head/sys/modules/dtrace/Makefile              |   3 +-
 head/sys/modules/dtrace/dtio/Makefile         |  13 +++++++++
 head/sys/modules/dtrace/dtraceall/dtraceall.c |   3 +-
 head/sys/modules/em/Makefile                  |   4 +-
 head/sys/modules/filemon/Makefile             |  11 +++++++
 head/sys/modules/geom/geom_raid/Makefile      |   4 +-
 head/sys/modules/igb/Makefile                 |   4 +-
 head/sys/modules/ixgbe/Makefile               |  19 ++++++++++++-
 head/sys/modules/linux/Makefile               |   6 ++--
 head/sys/modules/mwl/Makefile                 |   4 +-
 head/sys/modules/nand/Makefile                |  13 +++++++++
 head/sys/modules/nandfs/Makefile              |  12 ++++++++
 head/sys/modules/nandsim/Makefile             |  11 +++++++
 head/sys/modules/netmap/Makefile              |  14 +++++++++
 head/sys/modules/rdma/krping/Makefile         |   6 ++-
 head/sys/modules/toecore/Makefile             |   9 ++++++
 head/sys/modules/wpi/Makefile                 |   4 +-
 head/sys/modules/zfs/Makefile                 |   3 +-
 32 files changed, 274 insertions(+), 45 deletions(-)

diffs (649 lines):

diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/acpi/Makefile
--- a/head/sys/modules/acpi/Makefile	Wed Jul 25 16:47:10 2012 +0300
+++ b/head/sys/modules/acpi/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -1,6 +1,6 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/modules/acpi/Makefile 237981 2012-07-02 08:31:29Z mav $
 
-SUBDIR=		acpi_asus acpi_fujitsu acpi_hp acpi_ibm	\
+SUBDIR=		acpi_asus acpi_asus_wmi acpi_fujitsu acpi_hp acpi_ibm	\
 		acpi_panasonic acpi_sony acpi_toshiba acpi_video	\
 		acpi_dock acpi_wmi aibs
 
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/acpi/acpi/Makefile
--- a/head/sys/modules/acpi/acpi/Makefile	Wed Jul 25 16:47:10 2012 +0300
+++ b/head/sys/modules/acpi/acpi/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/modules/acpi/acpi/Makefile 231844 2012-02-16 22:59:29Z jkim $
+# $FreeBSD: head/sys/modules/acpi/acpi/Makefile 238381 2012-07-11 23:18:35Z jkim $
 
 .if !defined(FORCE_BUILD)
 .error "The ACPI module is deprecated, set FORCE_BUILD to force it"
@@ -54,11 +54,11 @@
 SRCS+=	pswalk.c psxface.c
 SRCS+=	rsaddr.c rscalc.c rscreate.c rsdump.c rsinfo.c rsio.c rsirq.c rslist.c
 SRCS+=	rsmemory.c rsmisc.c rsserial.c rsutils.c rsxface.c
-SRCS+=	tbfadt.c tbfind.c tbinstal.c tbutils.c tbxface.c tbxfroot.c
+SRCS+=	tbfadt.c tbfind.c tbinstal.c tbutils.c tbxface.c tbxfload.c tbxfroot.c
 SRCS+=	utaddress.c utalloc.c utcache.c utcopy.c utdebug.c utdecode.c
-SRCS+=	utdelete.c uteval.c utglobal.c utids.c utinit.c utlock.c utmath.c
-SRCS+=	utmisc.c utmutex.c utobject.c utosi.c utresrc.c utstate.c utxface.c
-SRCS+=	utxferror.c
+SRCS+=	utdelete.c uteval.c utexcep.c utglobal.c utids.c utinit.c utlock.c
+SRCS+=	utmath.c utmisc.c utmutex.c utobject.c utosi.c utresrc.c utstate.c
+SRCS+=	utxface.c utxferror.c
 #SRCS+=	utxfmutex.c
 
 # OSPM layer and core hardware drivers
@@ -86,6 +86,9 @@
 .if KTR
 CFLAGS+=-DKTR
 .endif
+.if SMP
+CFLAGS+=-DSMP
+.endif
 .if ACPI_MAX_TASKS
 CFLAGS+=-DACPI_MAX_TASKS=${ACPI_MAX_TASKS}
 .endif
@@ -113,14 +116,6 @@
 NORMAL_S=	${CC} -c ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}
 NM?=		nm
 
-.if ${MACHINE_CPUARCH} == "amd64"
-.if !defined(KERNBUILDDIR)
-CFLAGS+=-DSMP
-.endif
-SRCS+=	acpi_switch.S
-acpi_switch.o:	acpi_switch.S
-	${NORMAL_S}
-.endif
 acpi_wakecode.o: acpi_wakecode.S assym.s
 	${NORMAL_S}
 acpi_wakecode.bin: acpi_wakecode.o
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/acpi/acpi_asus_wmi/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/sys/modules/acpi/acpi_asus_wmi/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -0,0 +1,9 @@
+# $FreeBSD: head/sys/modules/acpi/acpi_asus_wmi/Makefile 237981 2012-07-02 08:31:29Z mav $
+
+.PATH:	${.CURDIR}/../../../dev/acpi_support
+
+KMOD=	acpi_asus_wmi
+CFLAGS+=-I${.CURDIR}/../../../dev/acpi_support
+SRCS=	acpi_asus_wmi.c opt_acpi.h acpi_if.h acpi_wmi_if.h device_if.h bus_if.h
+
+.include <bsd.kmod.mk>
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/aesni/Makefile
--- a/head/sys/modules/aesni/Makefile	Wed Jul 25 16:47:10 2012 +0300
+++ b/head/sys/modules/aesni/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -1,10 +1,10 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/modules/aesni/Makefile 235879 2012-05-24 04:10:34Z obrien $
 
 .PATH: ${.CURDIR}/../../crypto/aesni
 
 KMOD=	aesni
 SRCS=	aesni.c aesni_wrap.c
-SRCS+=	aesencdec_$(MACHINE_CPUARCH).S aeskeys_$(MACHINE_CPUARCH).S
+SRCS+=	aesencdec_${MACHINE_CPUARCH}.S aeskeys_${MACHINE_CPUARCH}.S
 SRCS+=	device_if.h bus_if.h opt_bus.h cryptodev_if.h
 
 .include <bsd.kmod.mk>
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/agp/Makefile
--- a/head/sys/modules/agp/Makefile	Wed Jul 25 16:47:10 2012 +0300
+++ b/head/sys/modules/agp/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/modules/agp/Makefile 235782 2012-05-22 10:59:26Z kib $
 
 .PATH: ${.CURDIR}/../../dev/agp
 
@@ -33,4 +33,16 @@
 		agp_unbind_memory	\
 		agp_memory_info
 
+
+.if ${MACHINE_CPUARCH} == "i386"  || ${MACHINE_CPUARCH} == "amd64"
+EXPORT_SYMS+=	intel_gtt_clear_range	\
+		intel_gtt_insert_pages	\
+		intel_gtt_get		\
+		intel_gtt_chipset_flush	\
+		intel_gtt_unmap_memory	\
+		intel_gtt_map_memory	\
+		intel_gtt_insert_sg_entries \
+		intel_gtt_get_bridge_device
+.endif
+
 .include <bsd.kmod.mk>
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/ath/Makefile
--- a/head/sys/modules/ath/Makefile	Wed Jul 25 16:47:10 2012 +0300
+++ b/head/sys/modules/ath/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -26,7 +26,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGES.
 #
-# $FreeBSD: head/sys/modules/ath/Makefile 231927 2012-02-20 03:07:07Z adrian $
+# $FreeBSD: head/sys/modules/ath/Makefile 238710 2012-07-23 03:52:18Z adrian $
 #
 
 ATH_RATE?=	sample		# tx rate control algorithm
@@ -36,7 +36,8 @@
 
 KMOD=	if_ath
 SRCS=	if_ath.c if_ath_debug.c if_ath_keycache.c if_ath_sysctl.c
-SRCS+=	if_ath_tx.c if_ath_tx_ht.c if_ath_led.c
+SRCS+=	if_ath_tx.c if_ath_tx_ht.c if_ath_led.c if_ath_rx.c if_ath_tdma.c
+SRCS+=	if_ath_beacon.c if_ath_rx_edma.c if_ath_tx_edma.c
 # NB: v3 eeprom support used by both AR5211 and AR5212; just include it
 SRCS+=	ah_osdep.c ah.c ah_regdomain.c ah_eeprom_v3.c
 SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h opt_ath.h opt_ah.h opt_wlan.h
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/cam/Makefile
--- a/head/sys/modules/cam/Makefile	Wed Jul 25 16:47:10 2012 +0300
+++ b/head/sys/modules/cam/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/modules/cam/Makefile 228026 2011-11-27 16:17:17Z marius $
+# $FreeBSD: head/sys/modules/cam/Makefile 235911 2012-05-24 14:07:44Z mav $
 
 S=	${.CURDIR}/../..
 
@@ -14,7 +14,7 @@
 SRCS+=	opt_cd.h
 SRCS+=	opt_pt.h
 SRCS+=	opt_sa.h
-SRCS+=	opt_ses.h
+SRCS+=	opt_enc.h
 SRCS+=	device_if.h bus_if.h vnode_if.h
 SRCS+=	cam.c
 .if exists($S/${MACHINE}/${MACHINE}/cam_machdep.c)
@@ -26,7 +26,9 @@
 SRCS+=	scsi_pass.c
 SRCS+=	scsi_pt.c
 SRCS+=	scsi_sa.c
-SRCS+=	scsi_ses.c
+SRCS+=	scsi_enc.c
+SRCS+=	scsi_enc_ses.c
+SRCS+=	scsi_enc_safte.c
 SRCS+=	scsi_sg.c
 SRCS+=	scsi_targ_bh.c scsi_target.c
 SRCS+=	scsi_xpt.c
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/cxgbe/Makefile
--- a/head/sys/modules/cxgbe/Makefile	Wed Jul 25 16:47:10 2012 +0300
+++ b/head/sys/modules/cxgbe/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -1,8 +1,13 @@
 #
-# $FreeBSD: head/sys/modules/cxgbe/Makefile 228561 2011-12-16 02:09:51Z np $
+# $FreeBSD: head/sys/modules/cxgbe/Makefile 237263 2012-06-19 07:34:13Z np $
 #
 
 SUBDIR = if_cxgbe
 SUBDIR+= firmware
+SUBDIR+= ${_tom}
+
+.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
+_tom=		tom
+.endif
 
 .include <bsd.subdir.mk>
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/cxgbe/if_cxgbe/Makefile
--- a/head/sys/modules/cxgbe/if_cxgbe/Makefile	Wed Jul 25 16:47:10 2012 +0300
+++ b/head/sys/modules/cxgbe/if_cxgbe/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -1,5 +1,5 @@
 #
-# $FreeBSD: head/sys/modules/cxgbe/if_cxgbe/Makefile 223483 2011-06-23 20:31:52Z uqs $
+# $FreeBSD: head/sys/modules/cxgbe/if_cxgbe/Makefile 237819 2012-06-29 19:51:06Z np $
 #
 
 CXGBE = ${.CURDIR}/../../../dev/cxgbe
@@ -9,7 +9,7 @@
 SRCS = t4_main.c t4_sge.c t4_l2t.c
 SRCS+= t4_hw.c
 SRCS+= device_if.h bus_if.h pci_if.h
-SRCS+= opt_inet.h
+SRCS+= opt_inet.h opt_inet6.h
 SRCS+= opt_ofed.h
 
 CFLAGS+= -I${CXGBE}
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/cxgbe/tom/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/sys/modules/cxgbe/tom/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -0,0 +1,15 @@
+#
+# $FreeBSD: head/sys/modules/cxgbe/tom/Makefile 237263 2012-06-19 07:34:13Z np $
+#
+
+CXGBE = ${.CURDIR}/../../../dev/cxgbe
+.PATH: ${CXGBE}/tom
+
+KMOD = t4_tom
+SRCS = t4_tom.c t4_connect.c t4_listen.c t4_cpl_io.c t4_tom_l2t.c
+SRCS+= device_if.h bus_if.h pci_if.h
+SRCS+= opt_inet.h
+
+CFLAGS+= -I${CXGBE}
+
+.include <bsd.kmod.mk>
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/drm2/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/sys/modules/drm2/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -0,0 +1,9 @@
+# $FreeBSD: head/sys/modules/drm2/Makefile 235847 2012-05-23 17:10:22Z kib $
+
+.include <bsd.own.mk>
+
+SUBDIR = \
+	drm2 \
+	i915kms
+
+.include <bsd.subdir.mk>
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/drm2/Makefile.inc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/sys/modules/drm2/Makefile.inc	Wed Jul 25 16:52:06 2012 +0300
@@ -0,0 +1,3 @@
+# $FreeBSD: head/sys/modules/drm2/Makefile.inc 235847 2012-05-23 17:10:22Z kib $
+
+.include "../Makefile.inc"
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/drm2/drm2/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/sys/modules/drm2/drm2/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -0,0 +1,39 @@
+# $FreeBSD: head/sys/modules/drm2/drm2/Makefile 235847 2012-05-23 17:10:22Z kib $
+
+.PATH:	${.CURDIR}/../../../dev/drm2
+KMOD	= drm2
+SRCS	= \
+	drm_agpsupport.c \
+	drm_auth.c \
+	drm_bufs.c \
+	drm_context.c \
+	drm_crtc.c \
+	drm_crtc_helper.c \
+	drm_dma.c \
+	drm_dp_iic_helper.c \
+	drm_drawable.c \
+	drm_drv.c \
+	drm_edid.c \
+	drm_fb_helper.c \
+	drm_fops.c \
+	drm_gem.c \
+	drm_gem_names.c \
+	drm_hashtab.c \
+	drm_ioctl.c \
+	drm_irq.c \
+	drm_linux_list_sort.c \
+	drm_lock.c \
+	drm_memory.c \
+	drm_mm.c \
+	drm_modes.c \
+	drm_pci.c \
+	drm_scatter.c \
+	drm_sman.c \
+	drm_stub.c \
+	drm_sysctl.c \
+	drm_vm.c
+
+SRCS	+=device_if.h bus_if.h pci_if.h device_if.h iicbus_if.h opt_drm.h \
+	opt_vm.h
+
+.include <bsd.kmod.mk>
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/drm2/i915kms/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/sys/modules/drm2/i915kms/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -0,0 +1,34 @@
+# $FreeBSD: head/sys/modules/drm2/i915kms/Makefile 235847 2012-05-23 17:10:22Z kib $
+
+.PATH:	${.CURDIR}/../../../dev/drm2/i915
+KMOD	= i915kms
+SRCS	= \
+	i915_debug.c \
+	i915_dma.c \
+	i915_drv.c \
+	i915_gem.c \
+	i915_gem_execbuffer.c \
+	i915_gem_evict.c \
+	i915_gem_gtt.c \
+	i915_gem_tiling.c \
+	i915_irq.c \
+	i915_suspend.c \
+	intel_bios.c \
+	intel_crt.c \
+	intel_display.c \
+	intel_dp.c \
+	intel_fb.c \
+	intel_hdmi.c \
+	intel_iic.c \
+	intel_lvds.c \
+	intel_modes.c \
+	intel_opregion.c \
+	intel_overlay.c \
+	intel_panel.c \
+	intel_ringbuffer.c \
+	intel_sdvo.c \
+	intel_sprite.c \
+	intel_tv.c
+SRCS	+= device_if.h bus_if.h pci_if.h iicbus_if.h iicbb_if.h opt_drm.h
+
+.include <bsd.kmod.mk>
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/dtrace/Makefile
--- a/head/sys/modules/dtrace/Makefile	Wed Jul 25 16:47:10 2012 +0300
+++ b/head/sys/modules/dtrace/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/modules/dtrace/Makefile 233410 2012-03-24 05:15:14Z gonzo $
+# $FreeBSD: head/sys/modules/dtrace/Makefile 238366 2012-07-11 16:27:02Z gnn $
 
 .include <bsd.own.mk>
 .include "Makefile.inc"
@@ -9,6 +9,7 @@
 		dtrace		\
 		dtraceall	\
 		dtrace_test	\
+		dtio		\
 		prototype	\
 		sdt		\
 		systrace
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/dtrace/dtio/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/sys/modules/dtrace/dtio/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -0,0 +1,13 @@
+# $FreeBSD: head/sys/modules/dtrace/dtio/Makefile 238366 2012-07-11 16:27:02Z gnn $
+
+.PATH: ${.CURDIR}/../../../kern
+
+KMOD=		dtio
+SRCS=		dtio_kdtrace.c \
+		vnode_if.h
+
+CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris \
+		-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \
+		-I${.CURDIR}/../../..
+
+.include <bsd.kmod.mk>
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/dtrace/dtraceall/dtraceall.c
--- a/head/sys/modules/dtrace/dtraceall/dtraceall.c	Wed Jul 25 16:47:10 2012 +0300
+++ b/head/sys/modules/dtrace/dtraceall/dtraceall.c	Wed Jul 25 16:52:06 2012 +0300
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: head/sys/modules/dtrace/dtraceall/dtraceall.c 223280 2011-06-18 23:02:53Z rmacklem $
+ * $FreeBSD: head/sys/modules/dtrace/dtraceall/dtraceall.c 238366 2012-07-11 16:27:02Z gnn $
  */
 
 #include <sys/cdefs.h>
@@ -65,6 +65,7 @@
 MODULE_DEPEND(dtraceall, cyclic, 1, 1, 1);
 MODULE_DEPEND(dtraceall, opensolaris, 1, 1, 1);
 MODULE_DEPEND(dtraceall, dtrace, 1, 1, 1);
+MODULE_DEPEND(dtraceall, dtio, 1, 1, 1);
 MODULE_DEPEND(dtraceall, dtmalloc, 1, 1, 1);
 MODULE_DEPEND(dtraceall, dtnfscl, 1, 1, 1);
 MODULE_DEPEND(dtraceall, dtnfsclient, 1, 1, 1);
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/em/Makefile
--- a/head/sys/modules/em/Makefile	Wed Jul 25 16:47:10 2012 +0300
+++ b/head/sys/modules/em/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/modules/em/Makefile 238181 2012-07-06 20:14:27Z kib $
 .PATH:  ${.CURDIR}/../../dev/e1000
 KMOD    = if_em
 SRCS    = device_if.h bus_if.h pci_if.h opt_inet.h
@@ -9,7 +9,7 @@
 # undefined when using modular driver if not needed
 LEGACY_SRC    += if_lem.c
 COMMON_SHARED = e1000_api.c e1000_phy.c e1000_nvm.c e1000_mac.c \
-		e1000_manage.c e1000_vf.c e1000_mbx.c
+		e1000_manage.c e1000_vf.c e1000_mbx.c e1000_i210.c
 PCIE_SHARED = e1000_80003es2lan.c e1000_ich8lan.c e1000_82571.c e1000_82575.c
 LEGACY_SHARED = e1000_82540.c e1000_82542.c e1000_82541.c e1000_82543.c
 
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/filemon/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/sys/modules/filemon/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -0,0 +1,11 @@
+# $FreeBSD: head/sys/modules/filemon/Makefile 236592 2012-06-04 22:54:19Z obrien $
+
+MAINTAINER=	obrien at FreeBSD.org
+
+.PATH: ${.CURDIR}/../../dev/filemon
+
+KMOD=	filemon
+SRCS=	${KMOD}.c
+SRCS+=	vnode_if.h opt_compat.h opt_capsicum.h
+
+.include <bsd.kmod.mk>
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/geom/geom_raid/Makefile
--- a/head/sys/modules/geom/geom_raid/Makefile	Wed Jul 25 16:47:10 2012 +0300
+++ b/head/sys/modules/geom/geom_raid/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/modules/geom/geom_raid/Makefile 234458 2012-04-19 12:30:12Z mav $
+# $FreeBSD: head/sys/modules/geom/geom_raid/Makefile 234848 2012-04-30 17:53:02Z mav $
 
 .PATH: ${.CURDIR}/../../../geom/raid
 
@@ -9,7 +9,7 @@
 SRCS+=	g_raid_md_if.h g_raid_md_if.c
 SRCS+=	g_raid_tr_if.h g_raid_tr_if.c
 
-SRCS+=	md_intel.c md_jmicron.c md_nvidia.c md_promise.c md_sii.c
+SRCS+=	md_ddf.c md_intel.c md_jmicron.c md_nvidia.c md_promise.c md_sii.c
 
 SRCS+=	tr_concat.c tr_raid0.c tr_raid1.c tr_raid1e.c tr_raid5.c
 
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/igb/Makefile
--- a/head/sys/modules/igb/Makefile	Wed Jul 25 16:47:10 2012 +0300
+++ b/head/sys/modules/igb/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -1,4 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: head/sys/modules/igb/Makefile 238148 2012-07-05 20:26:57Z jfv $
 .PATH:  ${.CURDIR}/../../dev/e1000
 KMOD    = if_igb
 SRCS    = device_if.h bus_if.h pci_if.h opt_inet.h
@@ -6,7 +6,7 @@
 SHARED_SRCS = e1000_api.c e1000_phy.c e1000_nvm.c e1000_mac.c e1000_manage.c
 SHARED_SRCS += e1000_80003es2lan.c e1000_82542.c e1000_82541.c e1000_82543.c
 SHARED_SRCS += e1000_82540.c e1000_ich8lan.c e1000_82571.c e1000_osdep.c
-SHARED_SRCS += e1000_82575.c e1000_vf.c e1000_mbx.c
+SHARED_SRCS += e1000_82575.c e1000_vf.c e1000_mbx.c e1000_i210.c
 
 CFLAGS += -I${.CURDIR}/../../dev/e1000 -DSMP
 
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/ixgbe/Makefile
--- a/head/sys/modules/ixgbe/Makefile	Wed Jul 25 16:47:10 2012 +0300
+++ b/head/sys/modules/ixgbe/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -1,11 +1,28 @@
-#$FreeBSD: head/sys/modules/ixgbe/Makefile 230775 2012-01-30 16:42:02Z jfv $
+#$FreeBSD: head/sys/modules/ixgbe/Makefile 236311 2012-05-30 13:55:43Z uqs $
+
+.include <bsd.own.mk>
+
 .PATH:  ${.CURDIR}/../../dev/ixgbe
+
 KMOD    = ixgbe
 SRCS    = device_if.h bus_if.h pci_if.h
+SRCS	+= opt_inet.h opt_inet6.h
 SRCS    += ixgbe.c ixv.c
 # Shared source
 SRCS    += ixgbe_common.c ixgbe_api.c ixgbe_phy.c ixgbe_mbx.c ixgbe_vf.c
 SRCS    += ixgbe_82599.c ixgbe_82598.c ixgbe_x540.c
 CFLAGS+= -I${.CURDIR}/../../dev/ixgbe -DSMP -DIXGBE_FDIR
 
+.if !defined(KERNBUILDDIR)
+.if ${MK_INET_SUPPORT} != "no"
+opt_inet.h:
+	@echo "#define INET 1" > ${.TARGET}
+.endif
+
+.if ${MK_INET6_SUPPORT} != "no"
+opt_inet6.h:
+	@echo "#define INET6 1" > ${.TARGET}
+.endif
+.endif
+
 .include <bsd.kmod.mk>
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/linux/Makefile
--- a/head/sys/modules/linux/Makefile	Wed Jul 25 16:47:10 2012 +0300
+++ b/head/sys/modules/linux/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/modules/linux/Makefile 232263 2012-02-28 18:30:18Z dim $
+# $FreeBSD: head/sys/modules/linux/Makefile 235078 2012-05-06 11:41:00Z uqs $
 
 .if ${MACHINE_CPUARCH} == "amd64"
 SFX= 32
@@ -13,8 +13,8 @@
 	linux${SFX}_machdep.c linux_mib.c linux_misc.c linux_signal.c \
 	linux_socket.c linux_stats.c linux_sysctl.c linux${SFX}_sysent.c \
 	linux${SFX}_sysvec.c linux_uid16.c linux_util.c linux_time.c \
-	opt_inet6.h opt_compat.h opt_posix.h opt_usb.h vnode_if.h \
-	device_if.h bus_if.h assym.s
+	opt_inet6.h opt_compat.h opt_kdtrace.h opt_posix.h opt_usb.h \
+	vnode_if.h device_if.h bus_if.h assym.s
 
 # XXX: for assym.s
 SRCS+=  opt_kstack_pages.h opt_nfs.h opt_compat.h opt_hwpmc_hooks.h
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/mwl/Makefile
--- a/head/sys/modules/mwl/Makefile	Wed Jul 25 16:47:10 2012 +0300
+++ b/head/sys/modules/mwl/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -26,14 +26,14 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGES.
 #
-# $FreeBSD$
+# $FreeBSD: head/sys/modules/mwl/Makefile 234866 2012-05-01 07:38:40Z uqs $
 #
 
 .PATH: ${.CURDIR}/../../dev/mwl
 
 KMOD=	if_mwl
 SRCS=	if_mwl.c if_mwl_pci.c mwlhal.c
-SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h opt_mwl.h
+SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h opt_mwl.h opt_wlan.h
 
 opt_mwl.h:
 	echo '#define MWL_DEBUG 1'> [email protected]
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/nand/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/sys/modules/nand/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -0,0 +1,13 @@
+# $FreeBSD: head/sys/modules/nand/Makefile 237605 2012-06-26 18:08:03Z takawata $
+
+.PATH: ${.CURDIR}/../../dev/nand
+
+KMOD = nand
+SRCS=	nand.c nand_bbt.c nand_cdev.c nand_generic.c nand_geom.c \
+	nand_id.c nandbus.c nandbus_if.c nand_if.c nfc_if.c \
+	nand_if.h device_if.h bus_if.h nfc_if.h nandbus_if.h
+
+MFILES=	kern/bus_if.m kern/device_if.m dev/nand/nfc_if.m \
+	dev/nand/nand_if.m dev/nand/nandbus_if.m
+
+.include <bsd.kmod.mk>
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/nandfs/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/sys/modules/nandfs/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -0,0 +1,12 @@
+# $FreeBSD: head/sys/modules/nandfs/Makefile 235537 2012-05-17 10:11:18Z gber $
+
+.PATH: ${.CURDIR}/../../fs/nandfs
+
+KMOD=	nandfs
+SRCS=	vnode_if.h \
+	bmap.c nandfs_bmap.c nandfs_dir.c nandfs_subr.c nandfs_vfsops.c \
+	nandfs_vnops.c nandfs_alloc.c nandfs_cpfile.c nandfs_dat.c \
+	nandfs_ifile.c nandfs_segment.c nandfs_sufile.c nandfs_buffer.c \
+	nandfs_cleaner.c
+
+.include <bsd.kmod.mk>
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/nandsim/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/sys/modules/nandsim/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -0,0 +1,11 @@
+# $FreeBSD: head/sys/modules/nandsim/Makefile 235537 2012-05-17 10:11:18Z gber $
+
+.PATH: ${.CURDIR}/../../dev/nand
+
+KMOD=	nandsim
+SRCS=	nandsim.c nandsim_chip.c nandsim_swap.c nandsim_ctrl.c nandsim_log.c\
+	bus_if.h device_if.h vnode_if.h nfc_if.h nand_if.h
+MFILES=	kern/bus_if.m kern/device_if.m\
+	dev/nand/nfc_if.m dev/nand/nand_if.m
+
+.include <bsd.kmod.mk>
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/netmap/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/sys/modules/netmap/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -0,0 +1,14 @@
+# $FreeBSD: head/sys/modules/netmap/Makefile 236256 2012-05-29 19:55:07Z luigi $
+#
+# Compile netmap as a module, useful if you want a netmap bridge
+# or loadable drivers.
+
+.PATH: ${.CURDIR}/../../dev/netmap
+.PATH.h: ${.CURDIR}/../../net
+KMOD	= netmap
+SRCS	= device_if.h bus_if.h opt_netmap.h
+SRCS	+= netmap.c netmap.h netmap_kern.h
+
+netmap.o: netmap_mem2.c
+
+.include <bsd.kmod.mk>
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/rdma/krping/Makefile
--- a/head/sys/modules/rdma/krping/Makefile	Wed Jul 25 16:47:10 2012 +0300
+++ b/head/sys/modules/rdma/krping/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -1,10 +1,12 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/modules/rdma/krping/Makefile 237560 2012-06-25 09:46:06Z uqs $
 
 RDMA= ${.CURDIR}/../../../contrib/rdma/krping
 .PATH: ${RDMA}
 
 KMOD= krping
 SRCS= krping.c krping_dev.c getopt.c
-SRCS+=  bus_if.h device_if.h opt_sched.h pci_if.h pcib_if.h
+SRCS+=  bus_if.h device_if.h pci_if.h pcib_if.h vnode_if.h
+SRCS+=  opt_sched.h opt_inet.h opt_inet6.h
+CFLAGS+= -I${.CURDIR}/../../../ofed/include
 
 .include <bsd.kmod.mk>
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/toecore/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/sys/modules/toecore/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -0,0 +1,9 @@
+# $FreeBSD: head/sys/modules/toecore/Makefile 237560 2012-06-25 09:46:06Z uqs $
+
+.PATH: ${.CURDIR}/../../netinet
+
+KMOD=	toecore
+SRCS=	toecore.c
+SRCS+=	opt_ofed.h opt_inet.h opt_inet6.h
+
+.include <bsd.kmod.mk>
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/wpi/Makefile
--- a/head/sys/modules/wpi/Makefile	Wed Jul 25 16:47:10 2012 +0300
+++ b/head/sys/modules/wpi/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -1,8 +1,8 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/modules/wpi/Makefile 236514 2012-06-03 12:19:16Z uqs $
 
 .PATH:  ${.CURDIR}/../../dev/wpi
 
 KMOD    = if_wpi
-SRCS    = if_wpi.c device_if.h bus_if.h pci_if.h
+SRCS    = if_wpi.c device_if.h bus_if.h pci_if.h opt_wlan.h
 
 .include <bsd.kmod.mk>
diff -r 4abb4d69799e -r b69912b1d8df head/sys/modules/zfs/Makefile
--- a/head/sys/modules/zfs/Makefile	Wed Jul 25 16:47:10 2012 +0300
+++ b/head/sys/modules/zfs/Makefile	Wed Jul 25 16:52:06 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/modules/zfs/Makefile 226738 2011-10-25 16:22:43Z pjd $
+# $FreeBSD: head/sys/modules/zfs/Makefile 236884 2012-06-11 11:35:22Z mm $
 
 KMOD=	zfs
 
@@ -13,6 +13,7 @@
 .PATH:	${SUNW}/common/nvpair
 SRCS+=	nvpair.c
 SRCS+=	nvpair_alloc_fixed.c
+SRCS+=	fnvpair.c
 .PATH:	${.CURDIR}/../../cddl/contrib/opensolaris/common/unicode
 SRCS+=	u8_textprep.c
 


More information about the Zrouter-src-freebsd mailing list