1 files changed, 13 insertions, 1 deletions

diff --git a/arch/x86/kernel/bugs_64.c b/arch/x86/kernel/bugs_64.c
index 8f520f93ffd4..9a3ed0649d4e 100644
--- a/arch/x86/kernel/bugs_64.c
+++ b/arch/x86/kernel/bugs_64.c
@@ -9,13 +9,25 @@
 #include <asm/bugs.h>
 #include <asm/processor.h>
 #include <asm/mtrr.h>
+#include <asm/cacheflush.h>
 
 void __init check_bugs(void)
 {
-        identify_cpu(&boot_cpu_data);
+        identify_boot_cpu();
 #if !defined(CONFIG_SMP)
         printk("CPU: ");
         print_cpu_info(&boot_cpu_data);
 #endif
         alternative_instructions();
+
+        /*
+         * Make sure the first 2MB area is not mapped by huge pages
+         * There are typically fixed size MTRRs in there and overlapping
+         * MTRRs into large pages causes slow downs.
+         *
+         * Right now we don't do that with gbpages because there seems
+         * very little benefit for that case.
+         */
+        if (!direct_gbpages)
+                set_memory_4k((unsigned long)__va(0), 1);
 }