Merge tag 'for-linus-4.20a-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel...
[muen/linux.git] / arch / x86 / xen / p2m.c
index 4fe8443..055e37e 100644 (file)
@@ -67,7 +67,7 @@
 #include <linux/hash.h>
 #include <linux/sched.h>
 #include <linux/seq_file.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 
@@ -182,7 +182,7 @@ static void p2m_init_identity(unsigned long *p2m, unsigned long pfn)
 static void * __ref alloc_p2m_page(void)
 {
        if (unlikely(!slab_is_available()))
-               return alloc_bootmem_align(PAGE_SIZE, PAGE_SIZE);
+               return memblock_alloc(PAGE_SIZE, PAGE_SIZE);
 
        return (void *)__get_free_page(GFP_KERNEL);
 }
@@ -190,7 +190,7 @@ static void * __ref alloc_p2m_page(void)
 static void __ref free_p2m_page(void *p)
 {
        if (unlikely(!slab_is_available())) {
-               free_bootmem((unsigned long)p, PAGE_SIZE);
+               memblock_free((unsigned long)p, PAGE_SIZE);
                return;
        }