summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/copypage-fa.c
diff options
context:
space:
mode:
authorCong Wang <amwang@redhat.com>2011-11-25 16:14:15 +0100
committerCong Wang <xiyou.wangcong@gmail.com>2012-03-20 14:48:14 +0100
commit5472e862de2bc4a47f18d216a4a626d5c7eeef90 (patch)
tree9533c823c1d6161950059c5e40abd32a1ea18c9d /arch/arm/mm/copypage-fa.c
parentinclude/linux/highmem.h: remove the second argument of k[un]map_atomic() (diff)
downloadlinux-5472e862de2bc4a47f18d216a4a626d5c7eeef90.tar.xz
linux-5472e862de2bc4a47f18d216a4a626d5c7eeef90.zip
arm: remove the second argument of k[un]map_atomic()
Signed-off-by: Cong Wang <amwang@redhat.com>
Diffstat (limited to 'arch/arm/mm/copypage-fa.c')
-rw-r--r--arch/arm/mm/copypage-fa.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mm/copypage-fa.c b/arch/arm/mm/copypage-fa.c
index d2852e1635b1..d130a5ece5d5 100644
--- a/arch/arm/mm/copypage-fa.c
+++ b/arch/arm/mm/copypage-fa.c
@@ -44,11 +44,11 @@ void fa_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);
fa_copy_user_page(kto, kfrom);
- kunmap_atomic(kfrom, KM_USER1);
- kunmap_atomic(kto, KM_USER0);
+ kunmap_atomic(kfrom);
+ kunmap_atomic(kto);
}
/*
@@ -58,7 +58,7 @@ void fa_copy_user_highpage(struct page *to, struct page *from,
*/
void fa_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\
@@ -77,7 +77,7 @@ void fa_clear_user_highpage(struct page *page, unsigned long vaddr)
: "=r" (ptr)
: "0" (kaddr), "I" (PAGE_SIZE / 32)
: "r1", "r2", "r3", "ip", "lr");
- kunmap_atomic(kaddr, KM_USER0);
+ kunmap_atomic(kaddr);
}
struct cpu_user_fns fa_user_fns __initdata = {