Merge branches 'x86/urgent', 'x86/amd-iommu', 'x86/apic', 'x86/cleanups', 'x86/core', 'x86/cpu', 'x86/fixmap', 'x86/gart', 'x86/kprobes', 'x86/memtest', 'x86/modules', 'x86/nmi', 'x86/pat', 'x86/reboot', 'x86/setup', 'x86/step', 'x86/unify-pci', 'x86/uv', 'x86/xen' and 'xen-64bit' into x86/for-linus
This commit is contained in:

@@ -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();
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user