svn commit: r303679 - in stable/11/sys/modules: hyperv/vmbus ixl ixlv linux64 mlx5
Bryan Drewery
bdrewery at FreeBSD.org
Tue Aug 2 20:56:02 UTC 2016
Author: bdrewery
Date: Tue Aug 2 20:56:00 2016
New Revision: 303679
URL: https://svnweb.freebsd.org/changeset/base/303679
Log:
MFC r303414,r303415,r303417:
r303414:
opt_random.h was removed in r287558 for opt_global.h
r303415:
opt_apic.h is only used on i386.
r303417:
opt_bdg.h was removed in r150636.
Approved by: re (gjb)
Modified:
stable/11/sys/modules/hyperv/vmbus/Makefile
stable/11/sys/modules/ixl/Makefile
stable/11/sys/modules/ixlv/Makefile
stable/11/sys/modules/linux64/Makefile
stable/11/sys/modules/mlx5/Makefile
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/modules/hyperv/vmbus/Makefile
==============================================================================
--- stable/11/sys/modules/hyperv/vmbus/Makefile Tue Aug 2 20:32:02 2016 (r303678)
+++ stable/11/sys/modules/hyperv/vmbus/Makefile Tue Aug 2 20:56:00 2016 (r303679)
@@ -16,7 +16,10 @@ SRCS= hv_channel.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
Modified: stable/11/sys/modules/ixl/Makefile
==============================================================================
--- stable/11/sys/modules/ixl/Makefile Tue Aug 2 20:32:02 2016 (r303678)
+++ stable/11/sys/modules/ixl/Makefile Tue Aug 2 20:56:00 2016 (r303679)
@@ -3,7 +3,7 @@
.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
Modified: stable/11/sys/modules/ixlv/Makefile
==============================================================================
--- stable/11/sys/modules/ixlv/Makefile Tue Aug 2 20:32:02 2016 (r303678)
+++ stable/11/sys/modules/ixlv/Makefile Tue Aug 2 20:56:00 2016 (r303679)
@@ -3,7 +3,7 @@
.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
Modified: stable/11/sys/modules/linux64/Makefile
==============================================================================
--- stable/11/sys/modules/linux64/Makefile Tue Aug 2 20:32:02 2016 (r303678)
+++ stable/11/sys/modules/linux64/Makefile Tue Aug 2 20:56:00 2016 (r303679)
@@ -16,7 +16,10 @@ SRCS= linux_fork.c linux_dummy.c linux_f
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
Modified: stable/11/sys/modules/mlx5/Makefile
==============================================================================
--- stable/11/sys/modules/mlx5/Makefile Tue Aug 2 20:32:02 2016 (r303678)
+++ stable/11/sys/modules/mlx5/Makefile Tue Aug 2 20:56:00 2016 (r303679)
@@ -25,7 +25,7 @@ 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
More information about the svn-src-stable-11
mailing list