|
@@ -228,11 +228,8 @@ phys_addr_t __init arm_memblock_steal(phys_addr_t size, phys_addr_t align)
|
|
|
return phys;
|
|
|
}
|
|
|
|
|
|
-void __init arm_memblock_init(const struct machine_desc *mdesc)
|
|
|
+static void __init arm_initrd_init(void)
|
|
|
{
|
|
|
- /* Register the kernel text, kernel data and initrd with memblock. */
|
|
|
- memblock_reserve(__pa(KERNEL_START), KERNEL_END - KERNEL_START);
|
|
|
-
|
|
|
#ifdef CONFIG_BLK_DEV_INITRD
|
|
|
/* FDT scan will populate initrd_start */
|
|
|
if (initrd_start && !phys_initrd_size) {
|
|
@@ -260,6 +257,14 @@ void __init arm_memblock_init(const struct machine_desc *mdesc)
|
|
|
initrd_end = initrd_start + phys_initrd_size;
|
|
|
}
|
|
|
#endif
|
|
|
+}
|
|
|
+
|
|
|
+void __init arm_memblock_init(const struct machine_desc *mdesc)
|
|
|
+{
|
|
|
+ /* Register the kernel text, kernel data and initrd with memblock. */
|
|
|
+ memblock_reserve(__pa(KERNEL_START), KERNEL_END - KERNEL_START);
|
|
|
+
|
|
|
+ arm_initrd_init();
|
|
|
|
|
|
arm_mm_memblock_reserve();
|
|
|
|