lkml.org 
[lkml]   [2012]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/60] mips: remove the second argument of k[un]map_atomic()
    Date
    Signed-off-by: Cong Wang <amwang@redhat.com>
    ---
    arch/mips/mm/c-r4k.c | 4 ++--
    arch/mips/mm/init.c | 8 ++++----
    2 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
    index 4f9eb0b..c97087d 100644
    --- 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 3b3ffd4..1a85ba9 100644
    --- 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();
    }
    --
    1.7.7.6


    \
     
     \ /
      Last update: 2012-02-10 06:45    [W:3.395 / U:0.728 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site