[SRU][B:linux-kvm][PATCH v2 1/1] UBUNTU: [Config] kvm: Add support for modifying LDT

[Roxana Nicolescu]

BugLink: https://bugs.launchpad.net/bugs/2009442

Enables CONFIG_MODIFY_LDT_SYSCALL, adding support for modifying
the local descriptor table. This allows glibs autopkgtests to run
properly.

Config matches main kernel as well as newer versions of linux-kvm.

Signed-off-by: Roxana Nicolescu <roxana.nicolescu at canonical.com>
---
 debian.kvm/config/annotations          | 7 ++++++-
 debian.kvm/config/config.common.ubuntu | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian.kvm/config/annotations b/debian.kvm/config/annotations
index 32f40d3deec7..bcfd4d76d02e 100644
--- a/debian.kvm/config/annotations
+++ b/debian.kvm/config/annotations
@@ -1 +1,6 @@
-# Annotations enforcement disabled
+# Menu: HEADER
+# FORMAT: 2
+# ARCH: x86
+
+CONFIG_MODIFY_LDT_SYSCALL				policy<{'amd64': 'm'}>
+CONFIG_MODIFY_LDT_SYSCALL				mark<ENFORCED> note<LP: #2009442>
diff --git a/debian.kvm/config/config.common.ubuntu b/debian.kvm/config/config.common.ubuntu
index 8bedc2793145..3fd179a91081 100644
--- a/debian.kvm/config/config.common.ubuntu
+++ b/debian.kvm/config/config.common.ubuntu
@@ -1387,7 +1387,7 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_MMIOTRACE is not set
 CONFIG_MMU=y
 CONFIG_MMU_NOTIFIER=y
-# CONFIG_MODIFY_LDT_SYSCALL is not set
+CONFIG_MODIFY_LDT_SYSCALL=y
 CONFIG_MODULES=y
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_MODULES_USE_ELF_RELA=y
@@ -2478,6 +2478,7 @@ CONFIG_VXLAN=m
 # CONFIG_X25 is not set
 CONFIG_X509_CERTIFICATE_PARSER=y
 CONFIG_X86=y
+# CONFIG_X86_16BIT is not set
 # CONFIG_X86_5LEVEL is not set
 CONFIG_X86_64=y
 CONFIG_X86_64_ACPI_NUMA=y
-- 
2.34.1