UBUNTU: [Config] CONFIG_VIRTIO_MMIO=n for s390x

BugLink: http://bugs.launchpad.net/bugs/1557689Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

debian.master/config/amd64/config.common.amd64

@@ -446,6 +446,7 @@ CONFIG_USB_SUPPORT=y
 CONFIG_UWB=m
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VGASTATE=m
+CONFIG_VIRTIO_MMIO=y
 CONFIG_VME_BUS=y
 CONFIG_VMXNET3=m
 CONFIG_VXFS_FS=m

debian.master/config/annotations

@@ -6839,7 +6839,8 @@ CONFIG_VIRTIO_PCI                               policy<{'amd64': 'y', 'arm64': '
 CONFIG_VIRTIO_PCI_LEGACY                        policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_VIRTIO_BALLOON                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_VIRTIO_INPUT                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
-CONFIG_VIRTIO_MMIO                              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
+CONFIG_VIRTIO_MMIO                              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'n'}>
+CONFIG_VIRTIO_MMIO				note<LP#1557689 CONFIG_VIRTIO_MMIO=n for s390x>
 CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 #
 CONFIG_VIRTIO_PCI                               mark<review>

debian.master/config/arm64/config.common.arm64

@@ -444,6 +444,7 @@ CONFIG_USB_SUPPORT=y
 CONFIG_UWB=m
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VGASTATE=m
+CONFIG_VIRTIO_MMIO=y
 CONFIG_VME_BUS=y
 CONFIG_VMXNET3=m
 CONFIG_VXFS_FS=m

debian.master/config/armhf/config.common.armhf

@@ -434,6 +434,7 @@ CONFIG_USB_SUPPORT=y
 CONFIG_UWB=m
 # CONFIG_VFIO_IOMMU_TYPE1 is not set
 CONFIG_VGASTATE=m
+CONFIG_VIRTIO_MMIO=y
 CONFIG_VME_BUS=y
 CONFIG_VMXNET3=m
 CONFIG_VXFS_FS=m

debian.master/config/config.common.ubuntu

@@ -8722,7 +8722,6 @@ CONFIG_VIRTIO_BALLOON=y
 CONFIG_VIRTIO_BLK=y
 CONFIG_VIRTIO_CONSOLE=y
 CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO_MMIO=y
 CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 CONFIG_VIRTIO_NET=y
 CONFIG_VIRTIO_PCI=y

debian.master/config/i386/config.common.i386

@@ -442,6 +442,7 @@ CONFIG_USB_SUPPORT=y
 CONFIG_UWB=m
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VGASTATE=m
+CONFIG_VIRTIO_MMIO=y
 CONFIG_VME_BUS=y
 CONFIG_VMXNET3=m
 CONFIG_VXFS_FS=m

debian.master/config/powerpc/config.common.powerpc

@@ -440,6 +440,7 @@ CONFIG_USB_SUPPORT=y
 CONFIG_UWB=m
 # CONFIG_VFIO_IOMMU_TYPE1 is not set
 CONFIG_VGASTATE=m
+CONFIG_VIRTIO_MMIO=y
 # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
 CONFIG_VME_BUS=y
 CONFIG_VMXNET3=m

debian.master/config/ppc64el/config.common.ppc64el

@@ -489,6 +489,7 @@ CONFIG_USB_SUPPORT=y
 CONFIG_UWB=m
 # CONFIG_VFIO_IOMMU_TYPE1 is not set
 CONFIG_VGASTATE=m
+CONFIG_VIRTIO_MMIO=y
 # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
 CONFIG_VME_BUS=y
 CONFIG_VMXNET3=m

debian.master/config/s390x/config.common.s390x

@@ -363,6 +363,7 @@ CONFIG_UPROBES=y
 # CONFIG_UWB is not set
 CONFIG_VFIO_IOMMU_TYPE1=m
 # CONFIG_VGASTATE is not set
+# CONFIG_VIRTIO_MMIO is not set
 CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
 # CONFIG_VME_BUS is not set
 # CONFIG_VMXNET3 is not set