Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1ab4ce762370b82870834899e49c08129d7ae271

Authored by Zhao Hongjiang
Committed by Linus Torvalds
1 parent 550fcb8f7c
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

arch/parisc/kernel/cache.c
Diff comments   View file @ 1ab4ce7
... ... @@ -606,7 +606,7 @@
606 606 /* Clear using TMPALIAS region. The page doesn't need to
607 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 611 /* The PA-RISC 2.0 Architecture book states on page F-6:
612 612 "Before a write-capable translation is enabled, *all*
... ... @@ -641,8 +641,8 @@
641 641 the `to' page must be flushed in copy_user_page_asm since
642 642 it can be used to bring in executable code. */
643 643  
644   - vfrom = kmap_atomic(from, KM_USER0);
645   - vto = kmap_atomic(to, KM_USER1);
  644 + vfrom = kmap_atomic(from);
  645 + vto = kmap_atomic(to);
646 646  
647 647 purge_kernel_dcache_page_asm((unsigned long)vto);
648 648 purge_tlb_start(flags);