aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-07-01 12:00:57 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-07-27 08:48:23 +0100
commiteda2e5dcc914b4d70f665443efc9780e89a5e5c1 (patch)
tree7ae6f96890ca4a5b7e9c14bf0723f9f275ddfe87
parent98864ff58dd2b8ef9e72b0d2c70f34e7ff24a2ee (diff)
ARM: LMB: Convert arm_memory_present() to use LMB memory information
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mm/init.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 99d6bc9b89b..a453982fdce 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -257,17 +257,16 @@ int pfn_valid(unsigned long pfn)
}
EXPORT_SYMBOL(pfn_valid);
-static void arm_memory_present(struct meminfo *mi)
+static void arm_memory_present(void)
{
}
#else
-static void arm_memory_present(struct meminfo *mi)
+static void arm_memory_present(void)
{
int i;
- for_each_bank(i, mi) {
- struct membank *bank = &mi->bank[i];
- memory_present(0, bank_pfn_start(bank), bank_pfn_end(bank));
- }
+ for (i = 0; i < memblock.memory.cnt; i++)
+ memory_present(0, memblock_start_pfn(&memblock.memory, i),
+ memblock_end_pfn(&memblock.memory, i));
}
#endif
@@ -320,7 +319,7 @@ void __init bootmem_init(void)
* Sparsemem tries to allocate bootmem in memory_present(),
* so must be done after the fixed reservations
*/
- arm_memory_present(mi);
+ arm_memory_present();
/*
* sparse_init() needs the bootmem allocator up and running.