Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf8156c5 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/mm: Only keep one version of pmd_populate() functions on nohash/32 



Use IS_ENABLED(CONFIG_BOOKE) to make single versions of
pmd_populate() and pmd_populate_kernel()

Reviewed-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent e80789a3

arch/powerpc/include/asm/nohash/32/pgalloc.h

+8 −20
Original line number Diff line number Diff line
@@ -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);

}



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

}



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

{

	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)

{

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

#endif



static inline void pgtable_free(void *table, unsigned index_size)

{