lkml.org 
[lkml]   [2019]   [Apr]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v1 12/15] powerpc/mm: Only keep one version of pmd_populate() functions on nohash/32
    Date
    Use IS_ENABLED(CONFIG_BOOKE) to make single versions of
    pmd_populate() and pmd_populate_kernel()

    Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
    ---
    arch/powerpc/include/asm/nohash/32/pgalloc.h | 28 ++++++++--------------------
    1 file changed, 8 insertions(+), 20 deletions(-)

    diff --git a/arch/powerpc/include/asm/nohash/32/pgalloc.h b/arch/powerpc/include/asm/nohash/32/pgalloc.h
    index 4615801aa953..7ee8e27070f4 100644
    --- a/arch/powerpc/include/asm/nohash/32/pgalloc.h
    +++ b/arch/powerpc/include/asm/nohash/32/pgalloc.h
    @@ -25,37 +25,25 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
    #define __pmd_free_tlb(tlb,x,a) do { } while (0)
    /* #define pgd_populate(mm, pmd, pte) BUG() */

    -#ifndef CONFIG_BOOKE
    -
    static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp,
    pte_t *pte)
    {
    - *pmdp = __pmd(__pa(pte) | _PMD_PRESENT);
    + if (IS_ENABLED(CONFIG_BOOKE))
    + *pmdp = __pmd((unsigned long)pte | _PMD_PRESENT);
    + else
    + *pmdp = __pmd(__pa(pte) | _PMD_PRESENT);
    }

    static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmdp,
    pgtable_t pte_page)
    {
    - *pmdp = __pmd(__pa(pte_page) | _PMD_USER | _PMD_PRESENT);
    + if (IS_ENABLED(CONFIG_BOOKE))
    + *pmdp = __pmd((unsigned long)pte_page | _PMD_PRESENT);
    + else
    + *pmdp = __pmd(__pa(pte_page) | _PMD_USER | _PMD_PRESENT);
    }

    #define pmd_pgtable(pmd) ((pgtable_t)pmd_page_vaddr(pmd))
    -#else
    -
    -static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp,
    - pte_t *pte)
    -{
    - *pmdp = __pmd((unsigned long)pte | _PMD_PRESENT);
    -}
    -
    -static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmdp,
    - pgtable_t pte_page)
    -{
    - *pmdp = __pmd((unsigned long)pte_page | _PMD_PRESENT);
    -}
    -
    -#define pmd_pgtable(pmd) ((pgtable_t)pmd_page_vaddr(pmd))
    -#endif

    static inline void pgtable_free(void *table, unsigned index_size)
    {
    --
    2.13.3
    \
     
     \ /
      Last update: 2019-04-03 22:07    [W:2.806 / U:0.340 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site