summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhao Hongjiang2013-05-08 01:18:12 +0200
committerLinus Torvalds2013-05-08 03:38:27 +0200
commit1ab4ce762370b82870834899e49c08129d7ae271 (patch)
tree5284ed32b444f07ffd6901e632d82f69090b9415
parentdrivers/rtc/rtc-rs5c372.c: add R2221T/L variant to the driver (diff)
downloadkernel-qcow2-linux-1ab4ce762370b82870834899e49c08129d7ae271.tar.gz
kernel-qcow2-linux-1ab4ce762370b82870834899e49c08129d7ae271.tar.xz
kernel-qcow2-linux-1ab4ce762370b82870834899e49c08129d7ae271.zip
parisc: remove the second argument of kmap_atomic()
kmap_atomic() requires only one argument now. Signed-off-by: Zhao Hongjiang <zhaohongjiang@huawei.com> Cc: "James E.J. Bottomley" <jejb@parisc-linux.org> Cc: Helge Deller <deller@gmx.de> Cc: Rolf Eike Beer <eike-kernel@sf-tec.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/parisc/kernel/cache.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
index 83ded26cad06..65fb4cbc3a0f 100644
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
@@ -606,7 +606,7 @@ void clear_user_highpage(struct page *page, unsigned long vaddr)
/* Clear using TMPALIAS region. The page doesn't need to
be flushed but the kernel mapping needs to be purged. */
- vto = kmap_atomic(page, KM_USER0);
+ vto = kmap_atomic(page);
/* The PA-RISC 2.0 Architecture book states on page F-6:
"Before a write-capable translation is enabled, *all*
@@ -641,8 +641,8 @@ void copy_user_highpage(struct page *to, struct page *from,
the `to' page must be flushed in copy_user_page_asm since
it can be used to bring in executable code. */
- vfrom = kmap_atomic(from, KM_USER0);
- vto = kmap_atomic(to, KM_USER1);
+ vfrom = kmap_atomic(from);
+ vto = kmap_atomic(to);
purge_kernel_dcache_page_asm((unsigned long)vto);
purge_tlb_start(flags);