diff options
-rw-r--r-- | arch/x86/mm/init_32.c | 10 | ||||
-rw-r--r-- | arch/x86/mm/init_64.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 27b829312944..9bb35cf8bc4c 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c | |||
@@ -565,11 +565,7 @@ void __init find_low_pfn_range(void) | |||
565 | { | 565 | { |
566 | /* it could update max_pfn */ | 566 | /* it could update max_pfn */ |
567 | 567 | ||
568 | /* | 568 | /* max_low_pfn is 0, we already have early_res support */ |
569 | * partially used pages are not usable - thus | ||
570 | * we are rounding upwards: | ||
571 | */ | ||
572 | min_low_pfn = PFN_UP(init_pg_tables_end); | ||
573 | 569 | ||
574 | max_low_pfn = max_pfn; | 570 | max_low_pfn = max_pfn; |
575 | if (max_low_pfn > MAXMEM_PFN) { | 571 | if (max_low_pfn > MAXMEM_PFN) { |
@@ -694,7 +690,9 @@ void __init setup_bootmem_allocator(void) | |||
694 | panic("Cannot find bootmem map of size %ld\n", bootmap_size); | 690 | panic("Cannot find bootmem map of size %ld\n", bootmap_size); |
695 | reserve_early(bootmap, bootmap + bootmap_size, "BOOTMAP"); | 691 | reserve_early(bootmap, bootmap + bootmap_size, "BOOTMAP"); |
696 | 692 | ||
697 | bootmap_size = init_bootmem(bootmap >> PAGE_SHIFT, max_low_pfn); | 693 | /* don't touch min_low_pfn */ |
694 | bootmap_size = init_bootmem_node(NODE_DATA(0), bootmap >> PAGE_SHIFT, | ||
695 | min_low_pfn, max_low_pfn); | ||
698 | printk(KERN_INFO " mapped low ram: 0 - %08lx\n", | 696 | printk(KERN_INFO " mapped low ram: 0 - %08lx\n", |
699 | max_pfn_mapped<<PAGE_SHIFT); | 697 | max_pfn_mapped<<PAGE_SHIFT); |
700 | printk(KERN_INFO " low ram: %08lx - %08lx\n", | 698 | printk(KERN_INFO " low ram: %08lx - %08lx\n", |
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 99a091ee5a6a..955dbc8abf6a 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c | |||
@@ -620,7 +620,9 @@ void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn) | |||
620 | PAGE_SIZE); | 620 | PAGE_SIZE); |
621 | if (bootmap == -1L) | 621 | if (bootmap == -1L) |
622 | panic("Cannot find bootmem map of size %ld\n", bootmap_size); | 622 | panic("Cannot find bootmem map of size %ld\n", bootmap_size); |
623 | bootmap_size = init_bootmem(bootmap >> PAGE_SHIFT, end_pfn); | 623 | /* don't touch min_low_pfn */ |
624 | bootmap_size = init_bootmem_node(NODE_DATA(0), bootmap >> PAGE_SHIFT, | ||
625 | 0, end_pfn); | ||
624 | e820_register_active_regions(0, start_pfn, end_pfn); | 626 | e820_register_active_regions(0, start_pfn, end_pfn); |
625 | free_bootmem_with_active_regions(0, end_pfn); | 627 | free_bootmem_with_active_regions(0, end_pfn); |
626 | early_res_to_bootmem(0, end_pfn<<PAGE_SHIFT); | 628 | early_res_to_bootmem(0, end_pfn<<PAGE_SHIFT); |