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

[linux-flexiantxendom0-3.2.10.git] / arch / arm / mm / copypage-v6.c

diff --git a/arch/arm/mm/copypage-v6.c b/arch/arm/mm/copypage-v6.c
index 29c7704..b9bcc9d 100644 (file)
--- a/arch/arm/mm/copypage-v6.c
+++ b/arch/arm/mm/copypage-v6.c
@@ -35,11 +35,11 @@ static void v6_copy_user_highpage_nonaliasing(struct page *to,
 {
        void *kto, *kfrom;
 
-       kfrom = kmap_atomic(from, KM_USER0);
-       kto = kmap_atomic(to, KM_USER1);
+       kfrom = kmap_atomic(from);
+       kto = kmap_atomic(to);
        copy_page(kto, kfrom);
-       kunmap_atomic(kto, KM_USER1);
-       kunmap_atomic(kfrom, KM_USER0);
+       kunmap_atomic(kto);
+       kunmap_atomic(kfrom);
 }
 
 /*
@@ -48,9 +48,9 @@ static void v6_copy_user_highpage_nonaliasing(struct page *to,
  */
 static void v6_clear_user_highpage_nonaliasing(struct page *page, unsigned long vaddr)
 {
-       void *kaddr = kmap_atomic(page, KM_USER0);
+       void *kaddr = kmap_atomic(page);
        clear_page(kaddr);
-       kunmap_atomic(kaddr, KM_USER0);
+       kunmap_atomic(kaddr);
 }
 
 /*