lkml.org 
[lkml]   [2011]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/62] sh: remove the second argument of k[un]map_atomic()
    Date

    Signed-off-by: Cong Wang <amwang@redhat.com>
    ---
    arch/sh/mm/cache-sh4.c | 4 ++--
    arch/sh/mm/cache.c | 12 ++++++------
    2 files changed, 8 insertions(+), 8 deletions(-)

    diff --git a/arch/sh/mm/cache-sh4.c b/arch/sh/mm/cache-sh4.c
    index 92eb986..112fea1 100644
    --- a/arch/sh/mm/cache-sh4.c
    +++ b/arch/sh/mm/cache-sh4.c
    @@ -244,7 +244,7 @@ static void sh4_flush_cache_page(void *args)
    if (map_coherent)
    vaddr = kmap_coherent(page, address);
    else
    - vaddr = kmap_atomic(page, KM_USER0);
    + vaddr = kmap_atomic(page);

    address = (unsigned long)vaddr;
    }
    @@ -259,7 +259,7 @@ static void sh4_flush_cache_page(void *args)
    if (map_coherent)
    kunmap_coherent(vaddr);
    else
    - kunmap_atomic(vaddr, KM_USER0);
    + kunmap_atomic(vaddr);
    }
    }

    diff --git a/arch/sh/mm/cache.c b/arch/sh/mm/cache.c
    index 5a580ea..616966a 100644
    --- a/arch/sh/mm/cache.c
    +++ b/arch/sh/mm/cache.c
    @@ -95,7 +95,7 @@ void copy_user_highpage(struct page *to, struct page *from,
    {
    void *vfrom, *vto;

    - vto = kmap_atomic(to, KM_USER1);
    + vto = kmap_atomic(to);

    if (boot_cpu_data.dcache.n_aliases && page_mapped(from) &&
    test_bit(PG_dcache_clean, &from->flags)) {
    @@ -103,16 +103,16 @@ void copy_user_highpage(struct page *to, struct page *from,
    copy_page(vto, vfrom);
    kunmap_coherent(vfrom);
    } else {
    - vfrom = kmap_atomic(from, KM_USER0);
    + vfrom = kmap_atomic(from);
    copy_page(vto, vfrom);
    - kunmap_atomic(vfrom, KM_USER0);
    + kunmap_atomic(vfrom);
    }

    if (pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK) ||
    (vma->vm_flags & VM_EXEC))
    __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 */
    smp_wmb();
    }
    @@ -120,14 +120,14 @@ EXPORT_SYMBOL(copy_user_highpage);

    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);

    if (pages_do_alias((unsigned long)kaddr, vaddr & PAGE_MASK))
    __flush_purge_region(kaddr, PAGE_SIZE);

    - kunmap_atomic(kaddr, KM_USER0);
    + kunmap_atomic(kaddr);
    }
    EXPORT_SYMBOL(clear_user_highpage);

    --
    1.7.4.4


    \
     
     \ /
      Last update: 2011-11-27 06:33    [W:0.021 / U:29.960 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site