diff options
Diffstat (limited to 'arch/arm/mm/init.c')
| -rw-r--r-- | arch/arm/mm/init.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 99d6bc9b89bb..a453982fdcef 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c | |||
| @@ -257,17 +257,16 @@ int pfn_valid(unsigned long pfn) | |||
| 257 | } | 257 | } |
| 258 | EXPORT_SYMBOL(pfn_valid); | 258 | EXPORT_SYMBOL(pfn_valid); |
| 259 | 259 | ||
| 260 | static void arm_memory_present(struct meminfo *mi) | 260 | static void arm_memory_present(void) |
| 261 | { | 261 | { |
| 262 | } | 262 | } |
| 263 | #else | 263 | #else |
| 264 | static void arm_memory_present(struct meminfo *mi) | 264 | static void arm_memory_present(void) |
| 265 | { | 265 | { |
| 266 | int i; | 266 | int i; |
| 267 | for_each_bank(i, mi) { | 267 | for (i = 0; i < memblock.memory.cnt; i++) |
| 268 | struct membank *bank = &mi->bank[i]; | 268 | memory_present(0, memblock_start_pfn(&memblock.memory, i), |
| 269 | memory_present(0, bank_pfn_start(bank), bank_pfn_end(bank)); | 269 | memblock_end_pfn(&memblock.memory, i)); |
| 270 | } | ||
| 271 | } | 270 | } |
| 272 | #endif | 271 | #endif |
| 273 | 272 | ||
| @@ -320,7 +319,7 @@ void __init bootmem_init(void) | |||
| 320 | * Sparsemem tries to allocate bootmem in memory_present(), | 319 | * Sparsemem tries to allocate bootmem in memory_present(), |
| 321 | * so must be done after the fixed reservations | 320 | * so must be done after the fixed reservations |
| 322 | */ | 321 | */ |
| 323 | arm_memory_present(mi); | 322 | arm_memory_present(); |
| 324 | 323 | ||
| 325 | /* | 324 | /* |
| 326 | * sparse_init() needs the bootmem allocator up and running. | 325 | * sparse_init() needs the bootmem allocator up and running. |
