Commit bc3e11be88010e09692ed1d214407d56caa90075
Committed by
Cong Wang
Cong Wang
1 parent
2480b20892
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
sh: remove the second argument of k[un]map_atomic()
Signed-off-by: Cong Wang <amwang@redhat.com>
Showing 2 changed files with 8 additions and 8 deletions Side-by-side Diff
arch/sh/mm/cache-sh4.c
| ... | ... | @@ -244,7 +244,7 @@ |
| 244 | 244 | if (map_coherent) |
| 245 | 245 | vaddr = kmap_coherent(page, address); |
| 246 | 246 | else |
| 247 | - vaddr = kmap_atomic(page, KM_USER0); | |
| 247 | + vaddr = kmap_atomic(page); | |
| 248 | 248 | |
| 249 | 249 | address = (unsigned long)vaddr; |
| 250 | 250 | } |
| ... | ... | @@ -259,7 +259,7 @@ |
| 259 | 259 | if (map_coherent) |
| 260 | 260 | kunmap_coherent(vaddr); |
| 261 | 261 | else |
| 262 | - kunmap_atomic(vaddr, KM_USER0); | |
| 262 | + kunmap_atomic(vaddr); | |
| 263 | 263 | } |
| 264 | 264 | } |
| 265 | 265 |
arch/sh/mm/cache.c
| ... | ... | @@ -95,7 +95,7 @@ |
| 95 | 95 | { |
| 96 | 96 | void *vfrom, *vto; |
| 97 | 97 | |
| 98 | - vto = kmap_atomic(to, KM_USER1); | |
| 98 | + vto = kmap_atomic(to); | |
| 99 | 99 | |
| 100 | 100 | if (boot_cpu_data.dcache.n_aliases && page_mapped(from) && |
| 101 | 101 | test_bit(PG_dcache_clean, &from->flags)) { |
| 102 | 102 | |
| 103 | 103 | |
| ... | ... | @@ -103,16 +103,16 @@ |
| 103 | 103 | copy_page(vto, vfrom); |
| 104 | 104 | kunmap_coherent(vfrom); |
| 105 | 105 | } else { |
| 106 | - vfrom = kmap_atomic(from, KM_USER0); | |
| 106 | + vfrom = kmap_atomic(from); | |
| 107 | 107 | copy_page(vto, vfrom); |
| 108 | - kunmap_atomic(vfrom, KM_USER0); | |
| 108 | + kunmap_atomic(vfrom); | |
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | if (pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK) || |
| 112 | 112 | (vma->vm_flags & VM_EXEC)) |
| 113 | 113 | __flush_purge_region(vto, PAGE_SIZE); |
| 114 | 114 | |
| 115 | - kunmap_atomic(vto, KM_USER1); | |
| 115 | + kunmap_atomic(vto); | |
| 116 | 116 | /* Make sure this page is cleared on other CPU's too before using it */ |
| 117 | 117 | smp_wmb(); |
| 118 | 118 | } |
| 119 | 119 | |
| ... | ... | @@ -120,14 +120,14 @@ |
| 120 | 120 | |
| 121 | 121 | void clear_user_highpage(struct page *page, unsigned long vaddr) |
| 122 | 122 | { |
| 123 | - void *kaddr = kmap_atomic(page, KM_USER0); | |
| 123 | + void *kaddr = kmap_atomic(page); | |
| 124 | 124 | |
| 125 | 125 | clear_page(kaddr); |
| 126 | 126 | |
| 127 | 127 | if (pages_do_alias((unsigned long)kaddr, vaddr & PAGE_MASK)) |
| 128 | 128 | __flush_purge_region(kaddr, PAGE_SIZE); |
| 129 | 129 | |
| 130 | - kunmap_atomic(kaddr, KM_USER0); | |
| 130 | + kunmap_atomic(kaddr); | |
| 131 | 131 | } |
| 132 | 132 | EXPORT_SYMBOL(clear_user_highpage); |
| 133 | 133 |