aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2016-01-04 04:31:05 +0000
committerBen Hutchings <ben@decadent.org.uk>2016-01-04 04:38:18 +0000
commit5ad5fe2d6f27e8a332be38841c36cf753239a4b8 (patch)
treeddd6d5205104754515a07bb1fabe17b2420b38fd
parenta0a899c6284f490f2c0f40619e79021356defce0 (diff)
downloadkernel_replicant_linux-5ad5fe2d6f27e8a332be38841c36cf753239a4b8.tar.gz
kernel_replicant_linux-5ad5fe2d6f27e8a332be38841c36cf753239a4b8.tar.bz2
kernel_replicant_linux-5ad5fe2d6f27e8a332be38841c36cf753239a4b8.zip
[x86] Enable DEBUG_WX, X86_INTEL_MPX
-rw-r--r--debian/changelog1
-rw-r--r--debian/config/kernelarch-x86/config2
2 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 5e39c8708be1..ae5a1d5c96fe 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 aafdc2bc6aac..d4f75a0d5b43 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