Merge tag 'xarray-4.20-rc7' of git://git.infradead.org/users/willy/linux-dax

[sfrench/cifs-2.6.git] / mm / sparse-vmemmap.c

diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
index 8301293331a27963b8a83bb190a6a7a905bcb74d..7fec057967966c27fdedf3ccffc082ce12eb7ef7 100644 (file)
--- a/mm/sparse-vmemmap.c
+++ b/mm/sparse-vmemmap.c
@@ -20,7 +20,7 @@
  */
 #include <linux/mm.h>
 #include <linux/mmzone.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
 #include <linux/memremap.h>
 #include <linux/highmem.h>
 #include <linux/slab.h>
@@ -42,8 +42,8 @@ static void * __ref __earlyonly_bootmem_alloc(int node,
                                unsigned long align,
                                unsigned long goal)
 {
-       return memblock_virt_alloc_try_nid_raw(size, align, goal,
-                                              BOOTMEM_ALLOC_ACCESSIBLE, node);
+       return memblock_alloc_try_nid_raw(size, align, goal,
+                                              MEMBLOCK_ALLOC_ACCESSIBLE, node);
 }
 
 void * __meminit vmemmap_alloc_block(unsigned long size, int node)