Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

[mirror_ubuntu-artful-kernel.git] / arch / arm / mm / copypage-xscale.c

diff --git a/arch/arm/mm/copypage-xscale.c b/arch/arm/mm/copypage-xscale.c
index 804eeddda97fd685f553d98e4bbe824c6bcaa2e3..0fb85025344d936734f0ff695ed21c2626414560 100644 (file)
--- a/arch/arm/mm/copypage-xscale.c
+++ b/arch/arm/mm/copypage-xscale.c
@@ -87,7 +87,7 @@ mc_copy_user_page(void *from, void *to)
 void xscale_mc_copy_user_highpage(struct page *to, struct page *from,
        unsigned long vaddr, struct vm_area_struct *vma)
 {
-       void *kto = kmap_atomic(to, KM_USER1);
+       void *kto = kmap_atomic(to);
 
        if (!test_and_set_bit(PG_dcache_clean, &from->flags))
                __flush_dcache_page(page_mapping(from), from);
@@ -100,7 +100,7 @@ void xscale_mc_copy_user_highpage(struct page *to, struct page *from,
 
        raw_spin_unlock(&minicache_lock);
 
-       kunmap_atomic(kto, KM_USER1);
+       kunmap_atomic(kto);
 }
 
 /*
@@ -109,7 +109,7 @@ void xscale_mc_copy_user_highpage(struct page *to, struct page *from,
 void
 xscale_mc_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                          \n\
        mov     r2, #0                          \n\
@@ -126,7 +126,7 @@ xscale_mc_clear_user_highpage(struct page *page, unsigned long vaddr)
        : "=r" (ptr)
        : "0" (kaddr), "I" (PAGE_SIZE / 32)
        : "r1", "r2", "r3", "ip");
-       kunmap_atomic(kaddr, KM_USER0);
+       kunmap_atomic(kaddr);
 }
 
 struct cpu_user_fns xscale_mc_user_fns __initdata = {