Merge "Build vfio-pci as a module, as dpdk tools expect it to be."

diff --combined kernel/arch/x86/configs/opnfv.config
index 502aa78,704af49..462858c
--- 1/kernel/arch/x86/configs/opnfv.config
--- 2/kernel/arch/x86/configs/opnfv.config
+++ b/kernel/arch/x86/configs/opnfv.config
@@@ -74,7 -74,7 +74,7 @@@ CONFIG_SYSVIPC_SYSCTL=
  CONFIG_POSIX_MQUEUE=y
  CONFIG_POSIX_MQUEUE_SYSCTL=y
  CONFIG_CROSS_MEMORY_ATTACH=y
 -# CONFIG_FHANDLE is not set
 +CONFIG_FHANDLE=y
  CONFIG_USELIB=y
  # CONFIG_AUDIT is not set
  CONFIG_HAVE_ARCH_AUDITSYSCALL=y
@@@ -734,15 -734,15 +734,15 @@@ CONFIG_IP_PNP_BOOTP=
  CONFIG_IP_PNP_RARP=y
  # CONFIG_NET_IPIP is not set
  # CONFIG_NET_IPGRE_DEMUX is not set
 -# CONFIG_NET_IP_TUNNEL is not set
 +CONFIG_NET_IP_TUNNEL=y
  CONFIG_IP_MROUTE=y
  # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
  CONFIG_IP_PIMSM_V1=y
  CONFIG_IP_PIMSM_V2=y
  CONFIG_SYN_COOKIES=y
 -# CONFIG_NET_UDP_TUNNEL is not set
 +CONFIG_NET_UDP_TUNNEL=y
  # CONFIG_NET_FOU is not set
 -# CONFIG_GENEVE is not set
 +CONFIG_GENEVE=y
  # CONFIG_INET_AH is not set
  # CONFIG_INET_ESP is not set
  # CONFIG_INET_IPCOMP is not set
@@@ -972,15 -972,11 +972,15 @@@ CONFIG_NET_SCH_FIFO=
  # CONFIG_DCB is not set
  CONFIG_DNS_RESOLVER=y
  # CONFIG_BATMAN_ADV is not set
 -# CONFIG_OPENVSWITCH is not set
 +CONFIG_OPENVSWITCH=m
 +CONFIG_OPENVSWITCH_VXLAN=m
 +CONFIG_OPENVSWITCH_GENEVE=m
  # CONFIG_VSOCKETS is not set
  # CONFIG_NETLINK_MMAP is not set
  # CONFIG_NETLINK_DIAG is not set
 -# CONFIG_MPLS is not set
 +CONFIG_MPLS=y
 +CONFIG_NET_MPLS_GSO=m
 +# CONFIG_MPLS_ROUTING is not set
  # CONFIG_HSR is not set
  # CONFIG_NET_SWITCHDEV is not set
  CONFIG_RPS=y
@@@ -1356,7 -1352,7 +1356,7 @@@ CONFIG_NET_CORE=
  # CONFIG_NET_TEAM is not set
  # CONFIG_MACVLAN is not set
  # CONFIG_IPVLAN is not set
 -# CONFIG_VXLAN is not set
 +CONFIG_VXLAN=y
  CONFIG_NETCONSOLE=y
  CONFIG_NETPOLL=y
  CONFIG_NET_POLL_CONTROLLER=y
@@@ -1452,12 -1448,10 +1452,12 @@@ CONFIG_IGB=
  CONFIG_IGBVF=y
  CONFIG_IXGB=y
  CONFIG_IXGBE=y
 +CONFIG_IXGBE_VXLAN=y
  # CONFIG_IXGBE_HWMON is not set
 -# CONFIG_IXGBEVF is not set
 +CONFIG_IXGBEVF=y
  CONFIG_I40E=y
 -# CONFIG_I40EVF is not set
 +CONFIG_I40E_VXLAN=y
 +CONFIG_I40EVF=y
  # CONFIG_FM10K is not set
  CONFIG_NET_VENDOR_I825XX=y
  # CONFIG_IP1000 is not set
@@@ -2379,7 -2373,7 +2379,7 @@@ CONFIG_FB=
  # CONFIG_FIRMWARE_EDID is not set
  CONFIG_FB_CMDLINE=y
  # CONFIG_FB_DDC is not set
 -# CONFIG_FB_BOOT_VESA_SUPPORT is not set
 +CONFIG_FB_BOOT_VESA_SUPPORT=y
  CONFIG_FB_CFB_FILLRECT=y
  CONFIG_FB_CFB_COPYAREA=y
  CONFIG_FB_CFB_IMAGEBLIT=y
@@@ -2406,7 -2400,7 +2406,7 @@@ CONFIG_FB_TILEBLITTING=
  # CONFIG_FB_IMSTT is not set
  # CONFIG_FB_VGA16 is not set
  # CONFIG_FB_UVESA is not set
 -# CONFIG_FB_VESA is not set
 +CONFIG_FB_VESA=y
  # CONFIG_FB_N411 is not set
  # CONFIG_FB_HGA is not set
  # CONFIG_FB_OPENCORES is not set
@@@ -2944,9 -2938,9 +2944,9 @@@ CONFIG_UIO=
  # CONFIG_UIO_NETX is not set
  # CONFIG_UIO_MF624 is not set
  CONFIG_VFIO_IOMMU_TYPE1=y
- CONFIG_VFIO_VIRQFD=y
+ CONFIG_VFIO_VIRQFD=m
  CONFIG_VFIO=y
- CONFIG_VFIO_PCI=y
+ CONFIG_VFIO_PCI=m
  # CONFIG_VFIO_PCI_VGA is not set
  CONFIG_VFIO_PCI_MMAP=y
  CONFIG_VFIO_PCI_INTX=y