diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-22 13:18:57 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-16 06:06:40 -0400 |
commit | 98c672cf1fa2a56f6f43e3f48b1208b83845582c (patch) | |
tree | 39ac68eb0d260f090cebabff9a2f2cf8c6bcebd2 /arch/arm/mm/init.c | |
parent | b65b4781fbd5846a82cdac0c32818af1a7452d1f (diff) |
ARM: Move platform memory reservations out of generic code
Move the platform specific bootmem memory reservations out of
arch/arm/mm/mmu.c into their respective platform files.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/init.c')
-rw-r--r-- | arch/arm/mm/init.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 4d2720888c50..1a227eea64bd 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c | |||
@@ -358,7 +358,7 @@ static void arm_memory_present(struct meminfo *mi) | |||
358 | } | 358 | } |
359 | #endif | 359 | #endif |
360 | 360 | ||
361 | void __init bootmem_init(void) | 361 | void __init bootmem_init(struct machine_desc *mdesc) |
362 | { | 362 | { |
363 | struct meminfo *mi = &meminfo; | 363 | struct meminfo *mi = &meminfo; |
364 | unsigned long min, max_low, max_high; | 364 | unsigned long min, max_low, max_high; |
@@ -380,6 +380,9 @@ void __init bootmem_init(void) | |||
380 | */ | 380 | */ |
381 | reserve_special_regions(); | 381 | reserve_special_regions(); |
382 | 382 | ||
383 | if (mdesc->reserve) | ||
384 | mdesc->reserve(); | ||
385 | |||
383 | /* | 386 | /* |
384 | * If the initrd is present, reserve its memory. | 387 | * If the initrd is present, reserve its memory. |
385 | */ | 388 | */ |