diff options
Diffstat (limited to 'arch/x86/mm/discontig_32.c')
-rw-r--r-- | arch/x86/mm/discontig_32.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/x86/mm/discontig_32.c b/arch/x86/mm/discontig_32.c index e2f0dd13a451..fa389d20383e 100644 --- a/arch/x86/mm/discontig_32.c +++ b/arch/x86/mm/discontig_32.c | |||
@@ -327,7 +327,6 @@ void __init initmem_init(unsigned long start_pfn, | |||
327 | * and ZONE_HIGHMEM. | 327 | * and ZONE_HIGHMEM. |
328 | */ | 328 | */ |
329 | 329 | ||
330 | remove_all_active_ranges(); | ||
331 | get_memcfg_numa(); | 330 | get_memcfg_numa(); |
332 | 331 | ||
333 | kva_pages = round_up(calculate_numa_remap_pages(), PTRS_PER_PTE); | 332 | kva_pages = round_up(calculate_numa_remap_pages(), PTRS_PER_PTE); |
@@ -390,21 +389,6 @@ void __init initmem_init(unsigned long start_pfn, | |||
390 | setup_bootmem_allocator(); | 389 | setup_bootmem_allocator(); |
391 | } | 390 | } |
392 | 391 | ||
393 | void __init zone_sizes_init(void) | ||
394 | { | ||
395 | unsigned long max_zone_pfns[MAX_NR_ZONES]; | ||
396 | memset(max_zone_pfns, 0, sizeof(max_zone_pfns)); | ||
397 | max_zone_pfns[ZONE_DMA] = | ||
398 | virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT; | ||
399 | max_zone_pfns[ZONE_NORMAL] = max_low_pfn; | ||
400 | #ifdef CONFIG_HIGHMEM | ||
401 | max_zone_pfns[ZONE_HIGHMEM] = highend_pfn; | ||
402 | #endif | ||
403 | |||
404 | free_area_init_nodes(max_zone_pfns); | ||
405 | return; | ||
406 | } | ||
407 | |||
408 | void __init set_highmem_pages_init(void) | 392 | void __init set_highmem_pages_init(void) |
409 | { | 393 | { |
410 | #ifdef CONFIG_HIGHMEM | 394 | #ifdef CONFIG_HIGHMEM |