Commit bc3e11be authored by Cong Wang's avatar Cong Wang Committed by Cong Wang

sh: remove the second argument of k[un]map_atomic()

Signed-off-by: default avatarCong Wang <amwang@redhat.com>
parent 2480b208
...@@ -244,7 +244,7 @@ static void sh4_flush_cache_page(void *args) ...@@ -244,7 +244,7 @@ static void sh4_flush_cache_page(void *args)
if (map_coherent) if (map_coherent)
vaddr = kmap_coherent(page, address); vaddr = kmap_coherent(page, address);
else else
vaddr = kmap_atomic(page, KM_USER0); vaddr = kmap_atomic(page);
address = (unsigned long)vaddr; address = (unsigned long)vaddr;
} }
...@@ -259,7 +259,7 @@ static void sh4_flush_cache_page(void *args) ...@@ -259,7 +259,7 @@ static void sh4_flush_cache_page(void *args)
if (map_coherent) if (map_coherent)
kunmap_coherent(vaddr); kunmap_coherent(vaddr);
else else
kunmap_atomic(vaddr, KM_USER0); kunmap_atomic(vaddr);
} }
} }
......
...@@ -95,7 +95,7 @@ void copy_user_highpage(struct page *to, struct page *from, ...@@ -95,7 +95,7 @@ void copy_user_highpage(struct page *to, struct page *from,
{ {
void *vfrom, *vto; void *vfrom, *vto;
vto = kmap_atomic(to, KM_USER1); vto = kmap_atomic(to);
if (boot_cpu_data.dcache.n_aliases && page_mapped(from) && if (boot_cpu_data.dcache.n_aliases && page_mapped(from) &&
test_bit(PG_dcache_clean, &from->flags)) { test_bit(PG_dcache_clean, &from->flags)) {
...@@ -103,16 +103,16 @@ void copy_user_highpage(struct page *to, struct page *from, ...@@ -103,16 +103,16 @@ void copy_user_highpage(struct page *to, struct page *from,
copy_page(vto, vfrom); copy_page(vto, vfrom);
kunmap_coherent(vfrom); kunmap_coherent(vfrom);
} else { } else {
vfrom = kmap_atomic(from, KM_USER0); vfrom = kmap_atomic(from);
copy_page(vto, vfrom); copy_page(vto, vfrom);
kunmap_atomic(vfrom, KM_USER0); kunmap_atomic(vfrom);
} }
if (pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK) || if (pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK) ||
(vma->vm_flags & VM_EXEC)) (vma->vm_flags & VM_EXEC))
__flush_purge_region(vto, PAGE_SIZE); __flush_purge_region(vto, PAGE_SIZE);
kunmap_atomic(vto, KM_USER1); kunmap_atomic(vto);
/* Make sure this page is cleared on other CPU's too before using it */ /* Make sure this page is cleared on other CPU's too before using it */
smp_wmb(); smp_wmb();
} }
...@@ -120,14 +120,14 @@ EXPORT_SYMBOL(copy_user_highpage); ...@@ -120,14 +120,14 @@ EXPORT_SYMBOL(copy_user_highpage);
void clear_user_highpage(struct page *page, unsigned long vaddr) void clear_user_highpage(struct page *page, unsigned long vaddr)
{ {
void *kaddr = kmap_atomic(page, KM_USER0); void *kaddr = kmap_atomic(page);
clear_page(kaddr); clear_page(kaddr);
if (pages_do_alias((unsigned long)kaddr, vaddr & PAGE_MASK)) if (pages_do_alias((unsigned long)kaddr, vaddr & PAGE_MASK))
__flush_purge_region(kaddr, PAGE_SIZE); __flush_purge_region(kaddr, PAGE_SIZE);
kunmap_atomic(kaddr, KM_USER0); kunmap_atomic(kaddr);
} }
EXPORT_SYMBOL(clear_user_highpage); EXPORT_SYMBOL(clear_user_highpage);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment