aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/mmu.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mm/mmu.c')
-rw-r--r--arch/arm/mm/mmu.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index e5d61ee3d4a1..d41a75ed3dce 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -605,9 +605,11 @@ void __init reserve_node_zero(pg_data_t *pgdat)
605 * Note that this can only be in node 0. 605 * Note that this can only be in node 0.
606 */ 606 */
607#ifdef CONFIG_XIP_KERNEL 607#ifdef CONFIG_XIP_KERNEL
608 reserve_bootmem_node(pgdat, __pa(&__data_start), &_end - &__data_start); 608 reserve_bootmem_node(pgdat, __pa(&__data_start), &_end - &__data_start,
609 BOOTMEM_DEFAULT);
609#else 610#else
610 reserve_bootmem_node(pgdat, __pa(&_stext), &_end - &_stext); 611 reserve_bootmem_node(pgdat, __pa(&_stext), &_end - &_stext,
612 BOOTMEM_DEFAULT);
611#endif 613#endif
612 614
613 /* 615 /*
@@ -615,7 +617,7 @@ void __init reserve_node_zero(pg_data_t *pgdat)
615 * and can only be in node 0. 617 * and can only be in node 0.
616 */ 618 */
617 reserve_bootmem_node(pgdat, __pa(swapper_pg_dir), 619 reserve_bootmem_node(pgdat, __pa(swapper_pg_dir),
618 PTRS_PER_PGD * sizeof(pgd_t)); 620 PTRS_PER_PGD * sizeof(pgd_t), BOOTMEM_DEFAULT);
619 621
620 /* 622 /*
621 * Hmm... This should go elsewhere, but we really really need to 623 * Hmm... This should go elsewhere, but we really really need to
@@ -638,8 +640,10 @@ void __init reserve_node_zero(pg_data_t *pgdat)
638 /* H1940 and RX3715 need to reserve this for suspend */ 640 /* H1940 and RX3715 need to reserve this for suspend */
639 641
640 if (machine_is_h1940() || machine_is_rx3715()) { 642 if (machine_is_h1940() || machine_is_rx3715()) {
641 reserve_bootmem_node(pgdat, 0x30003000, 0x1000); 643 reserve_bootmem_node(pgdat, 0x30003000, 0x1000,
642 reserve_bootmem_node(pgdat, 0x30081000, 0x1000); 644 BOOTMEM_DEFAULT);
645 reserve_bootmem_node(pgdat, 0x30081000, 0x1000,
646 BOOTMEM_DEFAULT);
643 } 647 }
644 648
645#ifdef CONFIG_SA1111 649#ifdef CONFIG_SA1111
@@ -650,7 +654,8 @@ void __init reserve_node_zero(pg_data_t *pgdat)
650 res_size = __pa(swapper_pg_dir) - PHYS_OFFSET; 654 res_size = __pa(swapper_pg_dir) - PHYS_OFFSET;
651#endif 655#endif
652 if (res_size) 656 if (res_size)
653 reserve_bootmem_node(pgdat, PHYS_OFFSET, res_size); 657 reserve_bootmem_node(pgdat, PHYS_OFFSET, res_size,
658 BOOTMEM_DEFAULT);
654} 659}
655 660
656/* 661/*