ARM: Convert platform reservations to use LMB rather than bootmem
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 4877e06..99d6bc9 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -271,7 +271,7 @@
}
#endif
-void __init arm_memblock_init(struct meminfo *mi)
+void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc)
{
int i;
@@ -297,11 +297,15 @@
arm_mm_memblock_reserve();
+ /* reserve any platform specific memblock areas */
+ if (mdesc->reserve)
+ mdesc->reserve();
+
memblock_analyze();
memblock_dump_all();
}
-void __init bootmem_init(struct machine_desc *mdesc)
+void __init bootmem_init(void)
{
struct meminfo *mi = &meminfo;
unsigned long min, max_low, max_high;
@@ -312,9 +316,6 @@
arm_bootmem_init(mi, min, max_low);
- if (mdesc->reserve)
- mdesc->reserve();
-
/*
* Sparsemem tries to allocate bootmem in memory_present(),
* so must be done after the fixed reservations