Merge tag 'edac_for_4.20_2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

[sfrench/cifs-2.6.git] / arch / arm64 / kernel / setup.c

diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index d0f62dd24c906b7054d7d7a76897c18736b50efd..953e316521fcaa34fcbe26a9ca8ca7de6b9f51e9 100644 (file)
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -26,7 +26,6 @@
 #include <linux/initrd.h>
 #include <linux/console.h>
 #include <linux/cache.h>
-#include <linux/bootmem.h>
 #include <linux/screen_info.h>
 #include <linux/init.h>
 #include <linux/kexec.h>
@@ -217,8 +216,9 @@ static void __init request_standard_resources(void)
        kernel_data.end     = __pa_symbol(_end - 1);
 
        num_standard_resources = memblock.memory.cnt;
-       standard_resources = alloc_bootmem_low(num_standard_resources *
-                                              sizeof(*standard_resources));
+       standard_resources = memblock_alloc_low(num_standard_resources *
+                                               sizeof(*standard_resources),
+                                               SMP_CACHE_BYTES);
 
        for_each_memblock(memory, region) {
                res = &standard_resources[i++];