From 5ffae53ee5d1e4892d375e5af0e636296d80cc22 Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 1 Jul 2010 12:00:57 +0100 Subject: [PATCH] --- yaml --- r: 201435 b: refs/heads/master c: eda2e5dcc914b4d70f665443efc9780e89a5e5c1 h: refs/heads/master i: 201433: ca453faa924e8d637bd4f9c7045748de4c59ee40 201431: d05ad67baf2d2ee5cfb436861a540ee1fd3298a4 v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/init.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 646d03c9323e..489d39302325 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98864ff58dd2b8ef9e72b0d2c70f34e7ff24a2ee +refs/heads/master: eda2e5dcc914b4d70f665443efc9780e89a5e5c1 diff --git a/trunk/arch/arm/mm/init.c b/trunk/arch/arm/mm/init.c index 99d6bc9b89bb..a453982fdcef 100644 --- a/trunk/arch/arm/mm/init.c +++ b/trunk/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.