Merge branch 'linus' into x86/core

[linux-2.6-omap-h63xx.git] / arch / x86 / mm / init_32.c

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 7113acd8ac45c4d9a4af70588c12c411e5be313d..4974e97dedfedad5adcdebc142c3ef2771f99c3a 100644 (file)
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -47,6 +47,7 @@
 #include <asm/paravirt.h>
 #include <asm/setup.h>
 #include <asm/cacheflush.h>
+#include <asm/smp.h>
 
 unsigned int __VMALLOC_RESERVE = 128 << 20;
 
@@ -844,6 +845,9 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
                reserve_early(table_start << PAGE_SHIFT,
                                 table_end << PAGE_SHIFT, "PGTABLE");
 
+       if (!after_init_bootmem)
+               early_memtest(start, end);
+
        return end >> PAGE_SHIFT;
 }