Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / arch / x86 / kernel / cpu / intel.c

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 0c8b916abced5c7e22bb94df1f53471a38656cac..6936d14d4c779c77abb32b7890ad14cdc2d12aee 100644 (file)
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -264,21 +264,6 @@ static void early_init_intel(struct cpuinfo_x86 *c)
        if (c->x86 == 6 && c->x86_model < 15)
                clear_cpu_cap(c, X86_FEATURE_PAT);
 
-#ifdef CONFIG_KMEMCHECK
-       /*
-        * P4s have a "fast strings" feature which causes single-
-        * stepping REP instructions to only generate a #DB on
-        * cache-line boundaries.
-        *
-        * Ingo Molnar reported a Pentium D (model 6) and a Xeon
-        * (model 2) with the same problem.
-        */
-       if (c->x86 == 15)
-               if (msr_clear_bit(MSR_IA32_MISC_ENABLE,
-                                 MSR_IA32_MISC_ENABLE_FAST_STRING_BIT) > 0)
-                       pr_info("kmemcheck: Disabling fast string operations\n");
-#endif
-
        /*
         * If fast string is not enabled in IA32_MISC_ENABLE for any reason,
         * clear the fast string and enhanced fast string CPU capabilities.