Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[firefly-linux-kernel-4.4.55.git] / arch / arm / mm / copypage-v4wb.c

diff --git a/arch/arm/mm/copypage-v4wb.c b/arch/arm/mm/copypage-v4wb.c
index cb589cbb2b6c0322b1cdd61faf72a602db04a72e..067d0fdd630c1082a0f895fee16bddfb4b002fa4 100644 (file)
--- a/arch/arm/mm/copypage-v4wb.c
+++ b/arch/arm/mm/copypage-v4wb.c
@@ -52,12 +52,12 @@ void v4wb_copy_user_highpage(struct page *to, struct page *from,
 {
        void *kto, *kfrom;
 
-       kto = kmap_atomic(to, KM_USER0);
-       kfrom = kmap_atomic(from, KM_USER1);
+       kto = kmap_atomic(to);
+       kfrom = kmap_atomic(from);
        flush_cache_page(vma, vaddr, page_to_pfn(from));
        v4wb_copy_user_page(kto, kfrom);
-       kunmap_atomic(kfrom, KM_USER1);
-       kunmap_atomic(kto, KM_USER0);
+       kunmap_atomic(kfrom);
+       kunmap_atomic(kto);
 }
 
 /*
@@ -67,7 +67,7 @@ void v4wb_copy_user_highpage(struct page *to, struct page *from,
  */
 void v4wb_clear_user_highpage(struct page *page, unsigned long vaddr)
 {
-       void *ptr, *kaddr = kmap_atomic(page, KM_USER0);
+       void *ptr, *kaddr = kmap_atomic(page);
        asm volatile("\
        mov     r1, %2                          @ 1\n\
        mov     r2, #0                          @ 1\n\
@@ -86,7 +86,7 @@ void v4wb_clear_user_highpage(struct page *page, unsigned long vaddr)
        : "=r" (ptr)
        : "0" (kaddr), "I" (PAGE_SIZE / 64)
        : "r1", "r2", "r3", "ip", "lr");
-       kunmap_atomic(kaddr, KM_USER0);
+       kunmap_atomic(kaddr);
 }
 
 struct cpu_user_fns v4wb_user_fns __initdata = {