Index: stable/11/sys/modules/hyperv/vmbus/Makefile
===================================================================
--- stable/11/sys/modules/hyperv/vmbus/Makefile	(revision 303678)
+++ stable/11/sys/modules/hyperv/vmbus/Makefile	(revision 303679)
@@ -1,31 +1,34 @@
 # $FreeBSD$
 
 .PATH:	${.CURDIR}/../../../dev/hyperv/vmbus \
 	${.CURDIR}/../../../dev/hyperv/vmbus/${MACHINE_CPUARCH}
 
 KMOD=	hv_vmbus
 SRCS=	hv_channel.c \
 	hv_channel_mgmt.c \
 	hv_connection.c \
 	hv_ring_buffer.c \
 	hyperv.c \
 	hyperv_busdma.c \
 	hyperv_machdep.c \
 	vmbus.c \
 	vmbus_et.c
 SRCS+=	acpi_if.h bus_if.h device_if.h opt_acpi.h
 
 # XXX: for assym.s
-SRCS+=  opt_kstack_pages.h opt_nfs.h opt_apic.h opt_hwpmc_hooks.h opt_compat.h
+SRCS+=  opt_kstack_pages.h opt_nfs.h opt_hwpmc_hooks.h opt_compat.h
+.if ${MACHINE_CPUARCH} == "i386"
+SRCS+=	opt_apic.h
+.endif
 
 SRCS+=	assym.s \
 	vmbus_vector.S
 
 vmbus_vector.o:
 	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
             ${.IMPSRC} -o ${.TARGET}
 
 CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \
 	 -I${.CURDIR}/../../../dev/hyperv/vmbus
 
 .include <bsd.kmod.mk>
Index: stable/11/sys/modules/ixl/Makefile
===================================================================
--- stable/11/sys/modules/ixl/Makefile	(revision 303678)
+++ stable/11/sys/modules/ixl/Makefile	(revision 303679)
@@ -1,20 +1,20 @@
 #$FreeBSD$
 
 .PATH:  ${.CURDIR}/../../dev/ixl
 
 KMOD    = if_ixl
-SRCS    = device_if.h bus_if.h pci_if.h pci_iov_if.h opt_bdg.h
+SRCS    = device_if.h bus_if.h pci_if.h pci_iov_if.h
 SRCS    += opt_inet.h opt_inet6.h opt_rss.h
 SRCS    += if_ixl.c ixl_txrx.c i40e_osdep.c
 
 # Shared source
 SRCS    += i40e_common.c i40e_nvm.c i40e_adminq.c i40e_lan_hmc.c i40e_hmc.c
 
 CFLAGS	+= -DSMP -DIXL_DEBUG_SYSCTL
 
 # Add Flow Director support
 # CFLAGS += -DIXL_FDIR
 # Debug messages / sysctls
 # CFLAGS += -DIXLE_DEBUG
 
 .include <bsd.kmod.mk>
Index: stable/11/sys/modules/ixlv/Makefile
===================================================================
--- stable/11/sys/modules/ixlv/Makefile	(revision 303678)
+++ stable/11/sys/modules/ixlv/Makefile	(revision 303679)
@@ -1,20 +1,20 @@
 #$FreeBSD$
 
 .PATH:  ${.CURDIR}/../../dev/ixl
 
 KMOD    = if_ixlv
-SRCS    = device_if.h bus_if.h pci_if.h pci_iov_if.h opt_bdg.h
+SRCS    = device_if.h bus_if.h pci_if.h pci_iov_if.h
 SRCS    += opt_inet.h opt_inet6.h opt_rss.h
 SRCS    += if_ixlv.c ixlvc.c ixl_txrx.c i40e_osdep.c
 
 # Shared source
 SRCS    += i40e_common.c i40e_nvm.c i40e_adminq.c
 
 CFLAGS	+= -DSMP
 
 # Add Flow Director support
 # CFLAGS += -DIXL_FDIR
 # Debug messages / sysctls
 # CFLAGS += -DIXLE_DEBUG
 
 .include <bsd.kmod.mk>
Index: stable/11/sys/modules/linux64/Makefile
===================================================================
--- stable/11/sys/modules/linux64/Makefile	(revision 303678)
+++ stable/11/sys/modules/linux64/Makefile	(revision 303679)
@@ -1,55 +1,58 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../compat/linux ${.CURDIR}/../../${MACHINE_ARCH}/linux
 
 VDSO=	linux_vdso
 
 KMOD=	linux64
 SRCS=	linux_fork.c linux_dummy.c linux_file.c linux_event.c \
 	linux_futex.c linux_getcwd.c linux_ioctl.c linux_ipc.c \
 	linux_machdep.c linux_misc.c linux_signal.c \
 	linux_socket.c linux_stats.c linux_sysctl.c linux_sysent.c \
 	linux_sysvec.c linux_time.c linux_vdso.c linux_timer.c \
 	opt_inet6.h opt_compat.h opt_posix.h opt_usb.h \
 	vnode_if.h device_if.h bus_if.h assym.s \
 	linux_support.s
 DPSRCS=	linux_genassym.c
 
 # XXX: for assym.s
-SRCS+=  opt_kstack_pages.h opt_nfs.h opt_apic.h opt_hwpmc_hooks.h
+SRCS+=  opt_kstack_pages.h opt_nfs.h opt_hwpmc_hooks.h
+.if ${MACHINE_CPUARCH} == "i386"
+SRCS+=	opt_apic.h
+.endif
 
 CLEANFILES=	linux_assym.h linux_genassym.o linux_locore.o
 
 OBJS=	${VDSO}.so
 
 linux_assym.h: linux_genassym.o
 	sh ${SYSDIR}/kern/genassym.sh linux_genassym.o > ${.TARGET}
 
 linux_locore.o: linux_locore.s linux_assym.h
 	${CC} -x assembler-with-cpp -DLOCORE -shared -mcmodel=small	\
 	-pipe -I. -I${SYSDIR} -Werror -Wall -fno-common -fPIC -nostdinc	\
 	-Wl,-T${.CURDIR}/../../${MACHINE_CPUARCH}/linux/${VDSO}.lds.s	\
 	-Wl,-soname=${VDSO}.so.1,-warn-common -nostdlib			\
 	    ${.IMPSRC} -o ${.TARGET}
 
 ${VDSO}.so: linux_locore.o
 	${OBJCOPY} --input-target binary --output-target elf64-x86-64-freebsd		\
 	    -S -g --binary-architecture i386:x86-64 linux_locore.o ${.TARGET}
 
 linux_support.o: assym.s linux_assym.h
 	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
 	    ${.IMPSRC} -o ${.TARGET}
 
 linux_genassym.o:
 	${CC} -c ${CFLAGS:N-fno-common} ${.IMPSRC}
 
 .if !defined(KERNBUILDDIR)
 .if defined(DEBUG)
 CFLAGS+=-DDEBUG
 .endif
 .if defined(KTR)
 CFLAGS+=-DKTR
 .endif
 .endif
 
 .include <bsd.kmod.mk>
Index: stable/11/sys/modules/mlx5/Makefile
===================================================================
--- stable/11/sys/modules/mlx5/Makefile	(revision 303678)
+++ stable/11/sys/modules/mlx5/Makefile	(revision 303679)
@@ -1,35 +1,35 @@
 # $FreeBSD$
 .PATH:	${.CURDIR}/../../dev/mlx5/mlx5_core
 
 KMOD=mlx5
 SRCS= \
 mlx5_alloc.c \
 mlx5_cmd.c \
 mlx5_cq.c \
 mlx5_eq.c \
 mlx5_eswitch_vacl.c \
 mlx5_flow_table.c \
 mlx5_fw.c \
 mlx5_health.c \
 mlx5_mad.c \
 mlx5_main.c \
 mlx5_mcg.c \
 mlx5_mr.c \
 mlx5_pagealloc.c \
 mlx5_pd.c \
 mlx5_port.c \
 mlx5_qp.c \
 mlx5_srq.c \
 mlx5_transobj.c \
 mlx5_uar.c \
 mlx5_vport.c \
 mlx5_wq.c \
 device_if.h bus_if.h vnode_if.h pci_if.h \
-        opt_inet.h opt_inet6.h opt_random.h opt_rss.h
+        opt_inet.h opt_inet6.h opt_rss.h
 
 CFLAGS+= -I${.CURDIR}/../../ofed/include
 CFLAGS+= -I${.CURDIR}/../../compat/linuxkpi/common/include
 
 .include <bsd.kmod.mk>
 
 CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
Index: stable/11
===================================================================
--- stable/11	(revision 303678)
+++ stable/11	(revision 303679)

Property changes on: stable/11
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r303414-303415,303417