diff options
-rw-r--r-- | arch/arm/kernel/devtree.c | 2 | ||||
-rw-r--r-- | arch/arm/kernel/setup.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c index 34d5fd585bbb..f751714d52c1 100644 --- a/arch/arm/kernel/devtree.c +++ b/arch/arm/kernel/devtree.c | |||
@@ -33,7 +33,7 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size) | |||
33 | 33 | ||
34 | void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) | 34 | void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) |
35 | { | 35 | { |
36 | return alloc_bootmem_align(size, align); | 36 | return memblock_virt_alloc(size, align); |
37 | } | 37 | } |
38 | 38 | ||
39 | void __init arm_dt_memblock_reserve(void) | 39 | void __init arm_dt_memblock_reserve(void) |
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 987a7f5bce5f..8ce1cbd08dba 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c | |||
@@ -717,7 +717,7 @@ static void __init request_standard_resources(const struct machine_desc *mdesc) | |||
717 | kernel_data.end = virt_to_phys(_end - 1); | 717 | kernel_data.end = virt_to_phys(_end - 1); |
718 | 718 | ||
719 | for_each_memblock(memory, region) { | 719 | for_each_memblock(memory, region) { |
720 | res = alloc_bootmem_low(sizeof(*res)); | 720 | res = memblock_virt_alloc(sizeof(*res), 0); |
721 | res->name = "System RAM"; | 721 | res->name = "System RAM"; |
722 | res->start = __pfn_to_phys(memblock_region_memory_base_pfn(region)); | 722 | res->start = __pfn_to_phys(memblock_region_memory_base_pfn(region)); |
723 | res->end = __pfn_to_phys(memblock_region_memory_end_pfn(region)) - 1; | 723 | res->end = __pfn_to_phys(memblock_region_memory_end_pfn(region)) - 1; |