mips: remove the second argument of k[un]map_atomic()
authorCong Wang <amwang@redhat.com>
Fri, 25 Nov 2011 15:14:15 +0000 (23:14 +0800)
committerCong Wang <xiyou.wangcong@gmail.com>
Tue, 20 Mar 2012 13:48:14 +0000 (21:48 +0800)
Signed-off-by: Cong Wang <amwang@redhat.com>
arch/mips/mm/c-r4k.c
arch/mips/mm/init.c

index 4f9eb0b..c97087d 100644 (file)
@@ -498,7 +498,7 @@ static inline void local_r4k_flush_cache_page(void *args)
                if (map_coherent)
                        vaddr = kmap_coherent(page, addr);
                else
-                       vaddr = kmap_atomic(page, KM_USER0);
+                       vaddr = kmap_atomic(page);
                addr = (unsigned long)vaddr;
        }
 
@@ -521,7 +521,7 @@ static inline void local_r4k_flush_cache_page(void *args)
                if (map_coherent)
                        kunmap_coherent();
                else
-                       kunmap_atomic(vaddr, KM_USER0);
+                       kunmap_atomic(vaddr);
        }
 }
 
index 3b3ffd4..1a85ba9 100644 (file)
@@ -207,21 +207,21 @@ void copy_user_highpage(struct page *to, struct page *from,
 {
        void *vfrom, *vto;
 
-       vto = kmap_atomic(to, KM_USER1);
+       vto = kmap_atomic(to);
        if (cpu_has_dc_aliases &&
            page_mapped(from) && !Page_dcache_dirty(from)) {
                vfrom = kmap_coherent(from, vaddr);
                copy_page(vto, vfrom);
                kunmap_coherent();
        } else {
-               vfrom = kmap_atomic(from, KM_USER0);
+               vfrom = kmap_atomic(from);
                copy_page(vto, vfrom);
-               kunmap_atomic(vfrom, KM_USER0);
+               kunmap_atomic(vfrom);
        }
        if ((!cpu_has_ic_fills_f_dc) ||
            pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK))
                flush_data_cache_page((unsigned long)vto);
-       kunmap_atomic(vto, KM_USER1);
+       kunmap_atomic(vto);
        /* Make sure this page is cleared on other CPU's too before using it */
        smp_wmb();
 }