Skip to content

Commit

Permalink
parisc: remove the second argument of kmap_atomic()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Zhao Hongjiang authored and Linus Torvalds committed May 8, 2013
1 parent 550fcb8 commit 1ab4ce7
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/parisc/kernel/cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -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*
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 1ab4ce7

Please sign in to comment.