---

 b/arch/x86/include/asm/cpufeature.h |   26 ++++++++++++++++++++------
 b/arch/x86/kernel/mpx.c             |    4 ++--
 b/arch/x86/kernel/traps.c           |    2 +-
 3 files changed, 23 insertions(+), 9 deletions(-)

diff -puN arch/x86/include/asm/cpufeature.h~x86-disabled_mask arch/x86/include/asm/cpufeature.h
--- a/arch/x86/include/asm/cpufeature.h~x86-disabled_mask	2014-06-18 08:48:41.329750895 -0700
+++ b/arch/x86/include/asm/cpufeature.h	2014-06-18 09:19:19.143546973 -0700
@@ -339,12 +339,6 @@ extern const char * const x86_power_flag
 #define cpu_has_eager_fpu	boot_cpu_has(X86_FEATURE_EAGER_FPU)
 #define cpu_has_topoext		boot_cpu_has(X86_FEATURE_TOPOEXT)
 
-#ifdef CONFIG_X86_INTEL_MPX
-#define cpu_has_mpx boot_cpu_has(X86_FEATURE_MPX)
-#else
-#define cpu_has_mpx 0
-#endif /* CONFIG_X86_INTEL_MPX */
-
 #ifdef CONFIG_X86_64
 
 #undef  cpu_has_vme
@@ -367,6 +361,22 @@ extern const char * const x86_power_flag
 
 #endif /* CONFIG_X86_64 */
 
+/*
+ * Add features and their corresponding config options here
+ * if you want to have the compiler optimize out code that
+ * uses them.
+ *
+ * You should not use this function directly.  Use
+ * static_cpu_has() so that you also benefit from alternatives
+ * when the features are enabled.
+ */
+static __always_inline int __cpu_feature_compile_enabled(u16 bit)
+{
+	if (bit == X86_FEATURE_MPX)
+		return IS_ENABLED(CONFIG_X86_MPX);
+	return 0;
+}
+
 #if __GNUC__ >= 4
 extern void warn_pre_alternatives(void);
 extern bool __static_cpu_has_safe(u16 bit);
@@ -378,6 +388,8 @@ extern bool __static_cpu_has_safe(u16 bi
  */
 static __always_inline __pure bool __static_cpu_has(u16 bit)
 {
+	if (!__cpu_feature_compile_enabled(bit))
+		return 0;
 #ifdef CC_HAVE_ASM_GOTO
 
 #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
@@ -458,6 +470,8 @@ static __always_inline __pure bool __sta
 
 static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
 {
+	if (!__cpu_feature_compile_enabled(bit))
+		return 0;
 #ifdef CC_HAVE_ASM_GOTO
 /*
  * We need to spell the jumps to the compiler because, depending on the offset,
diff -puN arch/x86/kernel/traps.c~x86-disabled_mask arch/x86/kernel/traps.c
--- a/arch/x86/kernel/traps.c~x86-disabled_mask	2014-06-18 09:14:23.686340296 -0700
+++ b/arch/x86/kernel/traps.c	2014-06-18 09:14:53.698681684 -0700
@@ -280,7 +280,7 @@ dotraplinkage void do_bounds(struct pt_r
 	if (!user_mode(regs))
 		die("bounds", regs, error_code);
 
-	if (!cpu_has_mpx) {
+	if (static_cpu_has(X86_FEATURE_MPX)) {
 		/* The exception is not from Intel MPX */
 		do_trap(X86_TRAP_BR, SIGSEGV, "bounds", regs, error_code, NULL);
 		goto exit;
diff -puN arch/x86/kernel/mpx.c~x86-disabled_mask arch/x86/kernel/mpx.c
--- a/arch/x86/kernel/mpx.c~x86-disabled_mask	2014-06-18 09:14:23.739342667 -0700
+++ b/arch/x86/kernel/mpx.c	2014-06-18 09:22:32.091172228 -0700
@@ -26,7 +26,7 @@ int mpx_register(struct task_struct *tsk
 {
 	struct mm_struct *mm = tsk->mm;
 
-	if (!cpu_has_mpx)
+	if (!static_cpu_has(X86_FEATURE_MPX))
 		return -EINVAL;
 
 	/*
@@ -51,7 +51,7 @@ int mpx_unregister(struct task_struct *t
 {
 	struct mm_struct *mm = current->mm;
 
-	if (!cpu_has_mpx)
+	if (!static_cpu_has(X86_FEATURE_MPX))
 		return -EINVAL;
 
 	mm->bd_addr = NULL;
_