Skip to contentSkip to conversation

parisc: remove the second argument of kmap_atomic

PATCH In review Zhao Hongjiang 3 participants 4 messages Apr 27, 2013 – Apr 28, 2013 PA-RISC architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 parisc: remove the second argument of kmap_atomic

kmap_atomic allows only one argument now, just move the second.

---
 arch/parisc/kernel/cache.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
arch/parisc/kernel/cache.c +3 -3
index 4b12890..6df734a 100644
@@ -609,7 +609,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*
@@ -644,8 +644,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);
Signature · 1 line
1.7.1
#1 lore raw
Quoted 1 line · Zhao Hongjiang

kmap_atomic allows only one argument now, just move the second.

Do you mean "remove"?

#2 lore raw
Quoted 5 lines · Rolf Eike Beer
Quoted 1 line · Zhao Hongjiang

kmap_atomic allows only one argument now, just move the second.

Do you mean "remove"?

yes, this should be "remove".

maintainer
#3 lore raw
In reply to Zhao Hongjiang
Quoted 3 lines · Zhao Hongjiang

kmap_atomic allows only one argument now, just move the second.

Thanks!
Queued up in parisc tree for 3.10.

Helge

Quoted 29 lines
---
 arch/parisc/kernel/cache.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
arch/parisc/kernel/cache.c +3 -3
index 4b12890..6df734a 100644
@@ -609,7 +609,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*
@@ -644,8 +644,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);