lkml.org 
[lkml]   [2011]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 06/20] sh: mmu_gather rework
    Fix up the sh mmu_gather code to conform to the new API.

    Cc: Paul Mundt <lethal@linux-sh.org>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    LKML-Reference: <new-submission>
    ---
    arch/sh/include/asm/tlb.h | 28 +++++++++++++++++-----------
    1 file changed, 17 insertions(+), 11 deletions(-)

    Index: linux-2.6/arch/sh/include/asm/tlb.h
    ===================================================================
    --- linux-2.6.orig/arch/sh/include/asm/tlb.h
    +++ linux-2.6/arch/sh/include/asm/tlb.h
    @@ -23,8 +23,6 @@ struct mmu_gather {
    unsigned long start, end;
    };

    -DECLARE_PER_CPU(struct mmu_gather, mmu_gathers);
    -
    static inline void init_tlb_gather(struct mmu_gather *tlb)
    {
    tlb->start = TASK_SIZE;
    @@ -36,17 +34,13 @@ static inline void init_tlb_gather(struc
    }
    }

    -static inline struct mmu_gather *
    -tlb_gather_mmu(struct mm_struct *mm, unsigned int full_mm_flush)
    +static inline void
    +tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned int full_mm_flush)
    {
    - struct mmu_gather *tlb = &get_cpu_var(mmu_gathers);
    -
    tlb->mm = mm;
    tlb->fullmm = full_mm_flush;

    init_tlb_gather(tlb);
    -
    - return tlb;
    }

    static inline void
    @@ -57,8 +51,6 @@ tlb_finish_mmu(struct mmu_gather *tlb, u

    /* keep the page table cache within bounds */
    check_pgt_cache();
    -
    - put_cpu_var(mmu_gathers);
    }

    static inline void
    @@ -91,7 +83,21 @@ tlb_end_vma(struct mmu_gather *tlb, stru
    }
    }

    -#define tlb_remove_page(tlb,page) free_page_and_swap_cache(page)
    +static inline void tlb_flush_mmu(struct mmu_gather *tlb)
    +{
    +}
    +
    +static inline int __tlb_remove_page(struct mmu_gather *tlb, struct page *page)
    +{
    + free_page_and_swap_cache(page);
    + return 1; /* avoid calling tlb_flush_mmu */
    +}
    +
    +static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)
    +{
    + __tlb_remove_page(tlb, page);
    +}
    +
    #define pte_free_tlb(tlb, ptep, addr) pte_free((tlb)->mm, ptep)
    #define pmd_free_tlb(tlb, pmdp, addr) pmd_free((tlb)->mm, pmdp)
    #define pud_free_tlb(tlb, pudp, addr) pud_free((tlb)->mm, pudp)



    \
     
     \ /
      Last update: 2011-04-01 15:41    [W:0.022 / U:94.988 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site