From: Zhao Hongjiang Date: Sat, 27 Apr 2013 10:42:11 +0000 (+0000) Subject: parisc: remove the second argument of kmap_atomic X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ba969c44ed9ab2d50428a2deeb3aa5e1145dd537;p=linux-beck.git parisc: remove the second argument of kmap_atomic kmap_atomic allows only one argument now, just move the second. Signed-off-by: Zhao Hongjiang Signed-off-by: Helge Deller --- 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);