From e0b9e5c8dae905ce7edd8097e07425ee37a44a5f Mon Sep 17 00:00:00 2001
From: Laura Abbott <labbott@fedoraproject.org>
Date: Dec 01 2015 23:09:59 +0000
Subject: Enable CONFIG_X86_INTEL_MPX (rhbz 1287279)


---

diff --git a/config-x86-generic b/config-x86-generic
index dff8775..0f38967 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -36,9 +36,7 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_X86_PM_TIMER=y
 
-# This requires changes to binutils and the compiler.  Plus you can't actually
-# buy hardware with MPX yet.  So... leave it off until all of that seems set.
-# CONFIG_X86_INTEL_MPX is not set
+CONFIG_X86_INTEL_MPX=y
 
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
diff --git a/kernel.spec b/kernel.spec
index 283320b..a194d84 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2040,6 +2040,9 @@ fi
 #
 # 
 %changelog
+* Tue Dec 01 2015 Laura Abbott <labbott@redhat.com>
+- Enable CONFIG_X86_INTEL_MPX (rhbz 1287279)
+
 * Tue Dec 01 2015 Josh Boyer <jwboyer@fedoraproject.org>
 - CVE-2015-7515 aiptek: crash on invalid device descriptors (rhbz 1285326 1285331)
 - CVE-2015-7833 usbvision: crash on invalid device descriptors (rhbz 1270158 1270160)