1 files changed, 14 insertions, 2 deletions

diff --git a/arch/x86/include/asm/disabled-features.h b/arch/x86/include/asm/disabled-features.h
index 1a9955dbf0a0..97534a7d38e3 100644
--- a/arch/x86/include/asm/disabled-features.h
+++ b/arch/x86/include/asm/disabled-features.h
@@ -10,13 +10,25 @@
  * cpu_feature_enabled().
  */
 
+#ifdef CONFIG_X86_64
+# define DISABLE_VME            (1<<(X86_FEATURE_VME & 31))
+# define DISABLE_K6_MTRR        (1<<(X86_FEATURE_K6_MTRR & 31))
+# define DISABLE_CYRIX_ARR      (1<<(X86_FEATURE_CYRIX_ARR & 31))
+# define DISABLE_CENTAUR_MCR    (1<<(X86_FEATURE_CENTAUR_MCR & 31))
+#else
+# define DISABLE_VME            0
+# define DISABLE_K6_MTRR        0
+# define DISABLE_CYRIX_ARR      0
+# define DISABLE_CENTAUR_MCR    0
+#endif /* CONFIG_X86_64 */
+
 /*
  * Make sure to add features to the correct mask
  */
-#define DISABLED_MASK0  0
+#define DISABLED_MASK0  (DISABLE_VME)
 #define DISABLED_MASK1  0
 #define DISABLED_MASK2  0
-#define DISABLED_MASK3  0
+#define DISABLED_MASK3  (DISABLE_CYRIX_ARR|DISABLE_CENTAUR_MCR|DISABLE_K6_MTRR)
 #define DISABLED_MASK4  0
 #define DISABLED_MASK5  0
 #define DISABLED_MASK6  0