Skip to content

Commit

Permalink
ARM: LMB: Convert arm_memory_present() to use LMB memory information
Browse files Browse the repository at this point in the history
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed Jul 27, 2010
1 parent 98864ff commit eda2e5d
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions arch/arm/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit eda2e5d

Please sign in to comment.