diff options
| -rw-r--r-- | arch/arm/mm/init.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index c2daabbe0af0..b2fbb4a711fc 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c | |||
| @@ -182,21 +182,6 @@ int pfn_valid(unsigned long pfn) | |||
| 182 | EXPORT_SYMBOL(pfn_valid); | 182 | EXPORT_SYMBOL(pfn_valid); |
| 183 | #endif | 183 | #endif |
| 184 | 184 | ||
| 185 | #ifndef CONFIG_SPARSEMEM | ||
| 186 | static void __init arm_memory_present(void) | ||
| 187 | { | ||
| 188 | } | ||
| 189 | #else | ||
| 190 | static void __init arm_memory_present(void) | ||
| 191 | { | ||
| 192 | struct memblock_region *reg; | ||
| 193 | |||
| 194 | for_each_memblock(memory, reg) | ||
| 195 | memory_present(0, memblock_region_memory_base_pfn(reg), | ||
| 196 | memblock_region_memory_end_pfn(reg)); | ||
| 197 | } | ||
| 198 | #endif | ||
| 199 | |||
| 200 | static bool arm_memblock_steal_permitted = true; | 185 | static bool arm_memblock_steal_permitted = true; |
| 201 | 186 | ||
| 202 | phys_addr_t __init arm_memblock_steal(phys_addr_t size, phys_addr_t align) | 187 | phys_addr_t __init arm_memblock_steal(phys_addr_t size, phys_addr_t align) |
| @@ -293,7 +278,7 @@ void __init bootmem_init(void) | |||
| 293 | * Sparsemem tries to allocate bootmem in memory_present(), | 278 | * Sparsemem tries to allocate bootmem in memory_present(), |
| 294 | * so must be done after the fixed reservations | 279 | * so must be done after the fixed reservations |
| 295 | */ | 280 | */ |
| 296 | arm_memory_present(); | 281 | memblocks_present(); |
| 297 | 282 | ||
| 298 | /* | 283 | /* |
| 299 | * sparse_init() needs the bootmem allocator up and running. | 284 | * sparse_init() needs the bootmem allocator up and running. |
