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

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

powerpc/book3s32: Remove CONFIG_BOOKE dependent code 



BOOK3S/32 cannot be BOOKE, so remove useless code

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 8ad94021

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

+0 −18
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ 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)

{
@@ -65,22 +63,6 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmdp, 
}



#define pmd_pgtable(pmd) pmd_page(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)lowmem_page_address(pte_page) | _PMD_PRESENT);

}



#define pmd_pgtable(pmd) pmd_page(pmd)

#endif



extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr);

extern pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long addr);

arch/powerpc/include/asm/book3s/32/pgtable.h

+0 −14
Original line number Diff line number Diff line
@@ -328,24 +328,10 @@ static inline void __ptep_set_access_flags(struct vm_area_struct *vma, 
#define __HAVE_ARCH_PTE_SAME

#define pte_same(A,B)	(((pte_val(A) ^ pte_val(B)) & ~_PAGE_HASHPTE) == 0)



/*

 * Note that on Book E processors, the pmd contains the kernel virtual

 * (lowmem) address of the pte page.  The physical address is less useful

 * because everything runs with translation enabled (even the TLB miss

 * handler).  On everything else the pmd contains the physical address

 * of the pte page.  -- paulus

 */

#ifndef CONFIG_BOOKE

#define pmd_page_vaddr(pmd)	\

	((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))

#define pmd_page(pmd)		\

	pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT)

#else

#define pmd_page_vaddr(pmd)	\

	((unsigned long) (pmd_val(pmd) & PAGE_MASK))

#define pmd_page(pmd)		\

	pfn_to_page((__pa(pmd_val(pmd)) >> PAGE_SHIFT))

#endif



/* to find an entry in a kernel page-table-directory */

#define pgd_offset_k(address) pgd_offset(&init_mm, address)