Merge tag 'spi-fix-v4.20-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/brooni...

[sfrench/cifs-2.6.git] / arch / arc / mm / highmem.c

diff --git a/arch/arc/mm/highmem.c b/arch/arc/mm/highmem.c
index 77ff64a874a1b4649d79e579054febd4dfdbb605..48e70015181048640e083e4c1f8b1deb9a02b95d 100644 (file)
--- a/arch/arc/mm/highmem.c
+++ b/arch/arc/mm/highmem.c
@@ -7,7 +7,7 @@
  *
  */
 
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
 #include <linux/export.h>
 #include <linux/highmem.h>
 #include <asm/processor.h>
@@ -123,7 +123,7 @@ static noinline pte_t * __init alloc_kmap_pgtable(unsigned long kvaddr)
        pud_k = pud_offset(pgd_k, kvaddr);
        pmd_k = pmd_offset(pud_k, kvaddr);
 
-       pte_k = (pte_t *)alloc_bootmem_low_pages(PAGE_SIZE);
+       pte_k = (pte_t *)memblock_alloc_low(PAGE_SIZE, PAGE_SIZE);
        pmd_populate_kernel(&init_mm, pmd_k, pte_k);
        return pte_k;
 }