svn commit: r308793 - in head/sys: conf modules/hyperv/pcib modules/hyperv/vmbus

[Dexuan Cui]

Author: dexuan
Date: Fri Nov 18 05:33:01 2016
New Revision: 308793
URL: https://svnweb.freebsd.org/changeset/base/308793

Log:
  hyperv/pcib: Fix the build for some kernel configs
  
  Add the dependency on pci explicitly for the pcib and vmbus drivers.
  The related Makefiles are updated accordingly too.
  
  Reviewed by:	sephe
  Approved by:	sephe (mentor)
  MFC after:	1 week
  Sponsored by:	Microsoft

Modified:
  head/sys/conf/files.amd64
  head/sys/conf/files.i386
  head/sys/modules/hyperv/pcib/Makefile
  head/sys/modules/hyperv/vmbus/Makefile

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64	Fri Nov 18 04:19:21 2016	(r308792)
+++ head/sys/conf/files.amd64	Fri Nov 18 05:33:01 2016	(r308793)
@@ -292,7 +292,7 @@ dev/hwpmc/hwpmc_uncore.c	optional	hwpmc
 dev/hwpmc/hwpmc_piv.c		optional	hwpmc
 dev/hwpmc/hwpmc_tsc.c		optional	hwpmc
 dev/hwpmc/hwpmc_x86.c		optional	hwpmc
-dev/hyperv/pcib/pcib.c					optional	hyperv
+dev/hyperv/pcib/pcib.c					optional	hyperv pci
 dev/hyperv/netvsc/hn_nvs.c				optional	hyperv
 dev/hyperv/netvsc/hn_rndis.c				optional	hyperv
 dev/hyperv/netvsc/if_hn.c				optional	hyperv
@@ -305,7 +305,7 @@ dev/hyperv/utilities/hv_timesync.c			opt
 dev/hyperv/utilities/hv_util.c				optional	hyperv
 dev/hyperv/vmbus/hyperv.c				optional	hyperv
 dev/hyperv/vmbus/hyperv_busdma.c			optional	hyperv
-dev/hyperv/vmbus/vmbus.c				optional	hyperv
+dev/hyperv/vmbus/vmbus.c				optional	hyperv pci
 dev/hyperv/vmbus/vmbus_br.c				optional	hyperv
 dev/hyperv/vmbus/vmbus_chan.c				optional	hyperv
 dev/hyperv/vmbus/vmbus_et.c				optional	hyperv

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386	Fri Nov 18 04:19:21 2016	(r308792)
+++ head/sys/conf/files.i386	Fri Nov 18 05:33:01 2016	(r308793)
@@ -249,7 +249,7 @@ dev/hwpmc/hwpmc_piv.c		optional hwpmc
 dev/hwpmc/hwpmc_ppro.c		optional hwpmc
 dev/hwpmc/hwpmc_tsc.c		optional hwpmc
 dev/hwpmc/hwpmc_x86.c		optional hwpmc
-dev/hyperv/pcib/pcib.c					optional	hyperv
+dev/hyperv/pcib/pcib.c					optional	hyperv pci
 dev/hyperv/netvsc/hn_nvs.c				optional	hyperv
 dev/hyperv/netvsc/hn_rndis.c				optional	hyperv
 dev/hyperv/netvsc/if_hn.c				optional	hyperv
@@ -262,7 +262,7 @@ dev/hyperv/utilities/hv_timesync.c			opt
 dev/hyperv/utilities/hv_util.c				optional	hyperv
 dev/hyperv/vmbus/hyperv.c				optional	hyperv
 dev/hyperv/vmbus/hyperv_busdma.c			optional	hyperv
-dev/hyperv/vmbus/vmbus.c				optional	hyperv
+dev/hyperv/vmbus/vmbus.c				optional	hyperv pci
 dev/hyperv/vmbus/vmbus_br.c				optional	hyperv
 dev/hyperv/vmbus/vmbus_chan.c				optional	hyperv
 dev/hyperv/vmbus/vmbus_et.c				optional	hyperv

Modified: head/sys/modules/hyperv/pcib/Makefile
==============================================================================
--- head/sys/modules/hyperv/pcib/Makefile	Fri Nov 18 04:19:21 2016	(r308792)
+++ head/sys/modules/hyperv/pcib/Makefile	Fri Nov 18 05:33:01 2016	(r308793)
@@ -5,7 +5,7 @@
 
 KMOD=	vmbus_pcib
 SRCS=	pcib.c
-SRCS+=	bus_if.h device_if.h vmbus_if.h
+SRCS+=	bus_if.h device_if.h pci_if.h pcib_if.h vmbus_if.h
 
 CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/pcib
 

Modified: head/sys/modules/hyperv/vmbus/Makefile
==============================================================================
--- head/sys/modules/hyperv/vmbus/Makefile	Fri Nov 18 04:19:21 2016	(r308792)
+++ head/sys/modules/hyperv/vmbus/Makefile	Fri Nov 18 05:33:01 2016	(r308793)
@@ -13,7 +13,7 @@ SRCS=	hyperv.c \
 	vmbus_et.c \
 	vmbus_if.c \
 	vmbus_xact.c
-SRCS+=	acpi_if.h bus_if.h device_if.h opt_acpi.h vmbus_if.h
+SRCS+=	acpi_if.h bus_if.h device_if.h opt_acpi.h pci_if.h pcib_if.h vmbus_if.h
 
 # XXX: for assym.s
 SRCS+=  opt_kstack_pages.h opt_nfs.h opt_hwpmc_hooks.h opt_compat.h