git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'x86/urgent', 'x86/amd-iommu', 'x86/apic', 'x86/cleanups', 'x86/core...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
mm
/
init_32.c
diff --git
a/arch/x86/mm/init_32.c
b/arch/x86/mm/init_32.c
index 9689a5138e6472e33c6d0862b3ae56194ffcedb4..d37f29376b0ce455ae3907051a58779f4b995a25 100644
(file)
--- a/
arch/x86/mm/init_32.c
+++ b/
arch/x86/mm/init_32.c
@@
-844,6
+844,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;
}
@@
-868,8
+871,6
@@
void __init paging_init(void)
*/
sparse_init();
zone_sizes_init();
-
- paravirt_post_allocator_init();
}
/*