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

diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index a79fe9aa7721aa56f05d8ab7995b6503cd98f618..e37585ba39e779167d474472b2160783d5769ae6 100644 (file)
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -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);
        }
 }
 

diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index b7ebc4fa89bcd5b4b77465ab60919317b513bf79..fbc70f3bbe8888adb21ae633dc8e28d3466441fb 100644 (file)
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -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();
 }