MFH

Sponsored by:	The FreeBSD Foundation

11 files changed, 14 insertions, 12 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index ec5618c..406373f 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -719,7 +719,7 @@ options 	ALTQ_CBQ	# Class Based Queueing
 options 	ALTQ_RED	# Random Early Detection
 options 	ALTQ_RIO	# RED In/Out
 options 	ALTQ_HFSC	# Hierarchical Packet Scheduler
-options		ALTQ_FAIRQ	# Fair Packet Scheduler
+options 	ALTQ_FAIRQ	# Fair Packet Scheduler
 options 	ALTQ_CDNR	# Traffic conditioner
 options 	ALTQ_PRIQ	# Priority Queueing
 options 	ALTQ_NOPCC	# Required if the TSC is unusable
diff --git a/sys/conf/files b/sys/conf/files
index 46e9768..6e57021 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -68,6 +68,7 @@ usbdevs_data.h			optional usb				   \
 	clean		"usbdevs_data.h"
 cam/cam.c			optional scbus
 cam/cam_compat.c		optional scbus
+cam/cam_iosched.c		optional scbus
 cam/cam_periph.c		optional scbus
 cam/cam_queue.c			optional scbus
 cam/cam_sim.c			optional scbus
@@ -1442,7 +1443,7 @@ dev/fdt/fdt_pinctrl.c		optional fdt fdt_pinctrl
 dev/fdt/fdt_pinctrl_if.m	optional fdt fdt_pinctrl
 dev/fdt/fdt_slicer.c		optional fdt cfi | fdt nand | fdt mx25l
 dev/fdt/fdt_static_dtb.S	optional fdt fdt_dtb_static \
-	dependency	"$S/boot/fdt/dts/${MACHINE}/${FDT_DTS_FILE}"
+	dependency	"fdt_dtb_file"
 dev/fdt/simplebus.c		optional fdt
 dev/fe/if_fe.c			optional fe
 dev/fe/if_fe_pccard.c		optional fe pccard
@@ -3748,6 +3749,7 @@ netpfil/ipfw/ip_dn_io.c		optional inet dummynet
 netpfil/ipfw/ip_dn_glue.c	optional inet dummynet
 netpfil/ipfw/ip_fw2.c		optional inet ipfirewall
 netpfil/ipfw/ip_fw_dynamic.c	optional inet ipfirewall
+netpfil/ipfw/ip_fw_eaction.c	optional inet ipfirewall
 netpfil/ipfw/ip_fw_log.c	optional inet ipfirewall
 netpfil/ipfw/ip_fw_pfil.c	optional inet ipfirewall
 netpfil/ipfw/ip_fw_sockopt.c	optional inet ipfirewall
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 85366fa..ca31558 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -277,6 +277,7 @@ dev/hyperv/vmbus/hv_hv.c				optional	hyperv
 dev/hyperv/vmbus/hv_et.c				optional	hyperv
 dev/hyperv/vmbus/hv_ring_buffer.c			optional	hyperv
 dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c			optional	hyperv
+dev/hyperv/vmbus/amd64/hv_vector.S			optional	hyperv
 dev/nfe/if_nfe.c		optional	nfe pci
 dev/ntb/if_ntb/if_ntb.c		optional	if_ntb
 dev/ntb/ntb_hw/ntb_hw.c		optional	if_ntb | ntb_hw
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index a9da11c..b77d1fc 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -45,8 +45,8 @@ arm/arm/hdmi_if.m		optional	hdmi
 arm/arm/identcpu.c		standard
 arm/arm/in_cksum.c		optional	inet | inet6
 arm/arm/in_cksum_arm.S		optional	inet | inet6
-arm/arm/intr.c			optional	!arm_intrng
-kern/subr_intr.c		optional	arm_intrng
+arm/arm/intr.c			optional	!intrng
+kern/subr_intr.c		optional	intrng
 arm/arm/locore.S		standard	no-obj
 arm/arm/machdep.c		standard
 arm/arm/machdep_intr.c		standard
@@ -57,7 +57,6 @@ arm/arm/mpcore_timer.c		optional	mpcore_timer
 arm/arm/nexus.c			standard
 arm/arm/ofw_machdep.c		optional	fdt
 arm/arm/physmem.c		standard
-kern/pic_if.m			optional	arm_intrng
 arm/arm/pl190.c			optional	pl190
 arm/arm/pl310.c			optional	pl310
 arm/arm/platform.c		optional	platform
@@ -116,6 +115,7 @@ font.h				optional	sc			\
 	compile-with	"uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \
 	no-obj no-implicit-rule before-depend				\
 	clean	"font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8"
+kern/pic_if.m			optional	intrng
 kern/subr_busdma_bufalloc.c	standard
 kern/subr_sfbuf.c		standard
 libkern/arm/aeabi_unwind.c	standard
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 4b6f158..eb8585f 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -252,6 +252,7 @@ dev/hyperv/vmbus/hv_hv.c				optional	hyperv
 dev/hyperv/vmbus/hv_et.c				optional	hyperv
 dev/hyperv/vmbus/hv_ring_buffer.c			optional	hyperv
 dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c			optional	hyperv
+dev/hyperv/vmbus/i386/hv_vector.S			optional	hyperv
 dev/ichwd/ichwd.c		optional ichwd
 dev/if_ndis/if_ndis.c		optional ndis
 dev/if_ndis/if_ndis_pccard.c	optional ndis pccard
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index d28e87b..3286c66 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -215,7 +215,7 @@ DEPEND_CFLAGS+=	-MT${.TARGET}
 .if defined(.PARSEDIR)
 # Only add in DEPEND_CFLAGS for CFLAGS on files we expect from DEPENDOBJS
 # as those are the only ones we will include.
-DEPEND_CFLAGS_CONDITION= !empty(DEPENDOBJS:M${.TARGET})
+DEPEND_CFLAGS_CONDITION= "${DEPENDOBJS:M${.TARGET}}" != ""
 CFLAGS+=	${${DEPEND_CFLAGS_CONDITION}:?${DEPEND_CFLAGS}:}
 .else
 CFLAGS+=	${DEPEND_CFLAGS}
diff --git a/sys/conf/options b/sys/conf/options
index 2283705..11e778f 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -329,6 +329,7 @@ CAM_DEBUG_TARGET	opt_cam.h
 CAM_DEBUG_LUN		opt_cam.h
 CAM_DEBUG_FLAGS		opt_cam.h
 CAM_BOOT_DELAY		opt_cam.h
+CAM_NETFLIX_IOSCHED	opt_cam.h
 SCSI_DELAY		opt_scsi.h
 SCSI_NO_SENSE_STRINGS	opt_scsi.h
 SCSI_NO_OP_STRINGS	opt_scsi.h
diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index 0e59187..f1d4b4a 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -63,7 +63,5 @@ BPF_JITTER		opt_bpf.h
 
 XENHVM			opt_global.h
 
-HYPERV			opt_global.h
-
 # options for the Intel C600 SAS driver (isci)
 ISCI_LOGGING	opt_isci.h
diff --git a/sys/conf/options.arm b/sys/conf/options.arm
index d6d7a37..4737b80 100644
--- a/sys/conf/options.arm
+++ b/sys/conf/options.arm
@@ -1,7 +1,6 @@
 #$FreeBSD$
 ARMV6			opt_global.h
 ARM_CACHE_LOCK_ENABLE	opt_global.h
-ARM_INTRNG		opt_global.h
 ARM_KERN_DIRECTMAP	opt_vm.h
 ARM_L2_PIPT		opt_global.h
 ARM_MANY_BOARD		opt_global.h
@@ -24,6 +23,7 @@ DEV_PMU			opt_global.h
 EFI			opt_platform.h
 FLASHADDR		opt_global.h
 GIC_DEFAULT_ICFGR_INIT	opt_global.h
+INTRNG			opt_global.h
 IPI_IRQ_START		opt_smp.h
 IPI_IRQ_END		opt_smp.h
 FREEBSD_BOOT_LOADER	opt_global.h
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 69eb7e3..e51f82c 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -123,7 +123,5 @@ BPF_JITTER		opt_bpf.h
 
 XENHVM			opt_global.h
 
-HYPERV			opt_global.h
-
 # options for the Intel C600 SAS driver (isci)
 ISCI_LOGGING	opt_isci.h
diff --git a/sys/conf/options.mips b/sys/conf/options.mips
index 69708cc..daae01f 100644
--- a/sys/conf/options.mips
+++ b/sys/conf/options.mips
@@ -144,4 +144,5 @@ PV_STATS		opt_pmap.h
 #
 # Options to use INTRNG code
 #
-MIPS_INTRNG		opt_global.h
+INTRNG			opt_global.h
+MIPS_NIRQ		opt_global.h