lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: Convert platform reservations to use LMB rather than bootmem

Browse Source 
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King
2010-05-22 19:47:18 +01:00
parent 2778f62056
commit 8d717a52d1
14 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/mm/init.c
View File

@ -271,7 +271,7 @@ static void arm_memory_present(struct meminfo *mi)
}
#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 @@ void __init arm_memblock_init(struct meminfo *mi)
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 @@ void __init bootmem_init(struct machine_desc *mdesc)
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