[linux] 03/03: [x86] Enable DEBUG_WX, X86_INTEL_MPX

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 5ad5fe2d6f27e8a332be38841c36cf753239a4b8
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Jan 4 04:31:05 2016 +0000

    [x86] Enable DEBUG_WX, X86_INTEL_MPX
---
 debian/changelog                    | 1 +
 debian/config/kernelarch-x86/config | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5e39c87..ae5a1d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,7 @@ linux (4.4~rc8-1~exp1) UNRELEASED; urgency=medium
   * [armhf] Enable INPUT_AXP20X_PEK, CAN_SUN4I, SND_SUN4I_CODEC as modules
     (Closes: #808623)
   * [x86] nvdimm: Change X86_PMEM_LEGACY from built-in to module
+  * [x86] Enable DEBUG_WX, X86_INTEL_MPX
 
   [ Ian Campbell ]
   * [armel/kirkwood] Updates/clarifications to kernel size limitations from
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index aafdc2b..d4f75a0 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -51,6 +51,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_ARCH_RANDOM=y
 CONFIG_X86_SMAP=y
+CONFIG_X86_INTEL_MPX=y
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
 CONFIG_SECCOMP=y
@@ -87,6 +88,7 @@ CONFIG_EARLY_PRINTK_EFI=y
 # CONFIG_X86_PTDUMP is not set
 CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_RODATA_TEST is not set
+CONFIG_DEBUG_WX=y
 CONFIG_DEBUG_SET_MODULE_RONX=y
 # CONFIG_DEBUG_NX_TEST is not set
 CONFIG_DOUBLEFAULT=y

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git