[PATCH Xenial SRU] UBUNTU: [Config] CONFIG_VM86=y, CONFIG_X86_LEGACY_VM86=y

[tim.gardner at canonical.com]

From: Tim Gardner <tim.gardner at canonical.com>

BugLink: http://bugs.launchpad.net/bugs/1499089

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian.master/config/amd64/config.common.amd64 | 1 +
 debian.master/config/config.common.ubuntu      | 3 +--
 debian.master/config/i386/config.common.i386   | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 3f616c4..2f89bb5 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -446,6 +446,7 @@ CONFIG_UWB=m
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VGASTATE=m
 CONFIG_VIRTIO_MMIO=y
+# CONFIG_VM86 is not set
 CONFIG_VME_BUS=y
 CONFIG_VMXNET3=m
 CONFIG_VXFS_FS=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 505a3c7..b129731 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -8767,7 +8767,6 @@ CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_VLSI_FIR=m
-# CONFIG_VM86 is not set
 CONFIG_VMCP=y
 CONFIG_VME_CA91CX42=m
 CONFIG_VME_PIO2=m
@@ -8935,7 +8934,7 @@ CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_L1_CACHE_SHIFT=6
-# CONFIG_X86_LEGACY_VM86 is not set
+CONFIG_X86_LEGACY_VM86=y
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_LONGHAUL=m
 CONFIG_X86_LONGRUN=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index d749ac9..df5d5f8 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -441,6 +441,7 @@ CONFIG_UWB=m
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VGASTATE=m
 CONFIG_VIRTIO_MMIO=y
+CONFIG_VM86=y
 CONFIG_VME_BUS=y
 CONFIG_VMXNET3=m
 CONFIG_VXFS_FS=m
-- 
1.9.1