Merge tag 'acpi-5.13-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-microblaze.git] / mm / percpu-vm.c

diff --git a/mm/percpu-vm.c b/mm/percpu-vm.c
index e46f7a6..8d3844b 100644 (file)
--- a/mm/percpu-vm.c
+++ b/mm/percpu-vm.c
@@ -8,6 +8,7 @@
  * Chunks are mapped into vmalloc areas and populated page by page.
  * This is the default chunk allocator.
  */
+#include "internal.h"
 
 static struct page *pcpu_chunk_page(struct pcpu_chunk *chunk,
                                    unsigned int cpu, int page_idx)
@@ -133,7 +134,7 @@ static void pcpu_pre_unmap_flush(struct pcpu_chunk *chunk,
 
 static void __pcpu_unmap_pages(unsigned long addr, int nr_pages)
 {
-       unmap_kernel_range_noflush(addr, nr_pages << PAGE_SHIFT);
+       vunmap_range_noflush(addr, addr + (nr_pages << PAGE_SHIFT));
 }
 
 /**
@@ -192,8 +193,8 @@ static void pcpu_post_unmap_tlb_flush(struct pcpu_chunk *chunk,
 static int __pcpu_map_pages(unsigned long addr, struct page **pages,
                            int nr_pages)
 {
-       return map_kernel_range_noflush(addr, nr_pages << PAGE_SHIFT,
-                                       PAGE_KERNEL, pages);
+       return vmap_pages_range_noflush(addr, addr + (nr_pages << PAGE_SHIFT),
+                                       PAGE_KERNEL, pages, PAGE_SHIFT);
 }
 
 /**