aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorZhao Hongjiang <zhaohongjiang@huawei.com>2013-05-07 19:18:12 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-07 21:38:27 -0400
commit1ab4ce762370b82870834899e49c08129d7ae271 (patch)
tree5284ed32b444f07ffd6901e632d82f69090b9415 /arch
parent550fcb8f7cab665ced9386bcf6b5a02df65318b6 (diff)
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>
Diffstat (limited to 'arch')
-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)
606 /* Clear using TMPALIAS region. The page doesn't need to 606 /* Clear using TMPALIAS region. The page doesn't need to
607 be flushed but the kernel mapping needs to be purged. */ 607 be flushed but the kernel mapping needs to be purged. */
608 608
609 vto = kmap_atomic(page, KM_USER0); 609 vto = kmap_atomic(page);
610 610
611 /* The PA-RISC 2.0 Architecture book states on page F-6: 611 /* The PA-RISC 2.0 Architecture book states on page F-6:
612 "Before a write-capable translation is enabled, *all* 612 "Before a write-capable translation is enabled, *all*
@@ -641,8 +641,8 @@ void copy_user_highpage(struct page *to, struct page *from,
641 the `to' page must be flushed in copy_user_page_asm since 641 the `to' page must be flushed in copy_user_page_asm since
642 it can be used to bring in executable code. */ 642 it can be used to bring in executable code. */
643 643
644 vfrom = kmap_atomic(from, KM_USER0); 644 vfrom = kmap_atomic(from);
645 vto = kmap_atomic(to, KM_USER1); 645 vto = kmap_atomic(to);
646 646
647 purge_kernel_dcache_page_asm((unsigned long)vto); 647 purge_kernel_dcache_page_asm((unsigned long)vto);
648 purge_tlb_start(flags); 648 purge_tlb_start(flags);