From owner-svn-src-stable@freebsd.org Tue Aug 2 20:56:02 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7F297BAD46C; Tue, 2 Aug 2016 20:56:02 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5A7F81D61; Tue, 2 Aug 2016 20:56:02 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u72Ku1Sf018278; Tue, 2 Aug 2016 20:56:01 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u72Ku1A6018273; Tue, 2 Aug 2016 20:56:01 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201608022056.u72Ku1A6018273@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 2 Aug 2016 20:56:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r303679 - in stable/11/sys/modules: hyperv/vmbus ixl ixlv linux64 mlx5 X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Aug 2016 20:56:02 -0000 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