lkml.org 
[lkml]   [2011]   [Mar]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 09/13] unicore: mmu_gather rework
    Fix up the unicore mmu_gather code to conform to the new API.

    Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    ---
    arch/unicore32/include/asm/tlb.h | 32 ++++++++++++++++++++------------
    1 file changed, 20 insertions(+), 12 deletions(-)

    Index: linux-2.6/arch/unicore32/include/asm/tlb.h
    ===================================================================
    --- linux-2.6.orig/arch/unicore32/include/asm/tlb.h
    +++ linux-2.6/arch/unicore32/include/asm/tlb.h
    @@ -27,17 +27,11 @@ struct mmu_gather {
    unsigned long range_end;
    };

    -DECLARE_PER_CPU(struct mmu_gather, mmu_gathers);
    -
    -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 fullmm)
    {
    - struct mmu_gather *tlb = &get_cpu_var(mmu_gathers);
    -
    tlb->mm = mm;
    - tlb->fullmm = full_mm_flush;
    -
    - return tlb;
    + tlb->fullmm = fullmm;
    }

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

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

    /*
    @@ -88,7 +80,23 @@ tlb_end_vma(struct mmu_gather *tlb, stru
    flush_tlb_range(vma, tlb->range_start, tlb->range_end);
    }

    -#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 0;
    +}
    +
    +static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)
    +{
    + if (__tlb_remove_page(tlb, page))
    + tlb_flush_mmu(tlb);
    +}
    +
    +
    #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, x, addr) do { } while (0)



    \
     
     \ /
      Last update: 2011-03-02 18:59    [W:0.022 / U:32.256 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site