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

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

powerpc/mm: Move pgtable_t into platform headers 



This patch move pgtable_t into platform headers.

It gets rid of the CONFIG_PPC_64K_PAGES case for PPC64
as nohash/64 doesn't support CONFIG_PPC_64K_PAGES.

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 994da93d

arch/powerpc/include/asm/book3s/32/mmu-hash.h

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ struct ppc_bat { 
	u32 batu;

	u32 batl;

};



typedef struct page *pgtable_t;

#endif /* !__ASSEMBLY__ */



/*

arch/powerpc/include/asm/book3s/64/mmu.h

+9 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
#ifndef _ASM_POWERPC_BOOK3S_64_MMU_H_

#define _ASM_POWERPC_BOOK3S_64_MMU_H_



#include <asm/page.h>



#ifndef __ASSEMBLY__

/*

 * Page size definition
@@ -24,6 +26,13 @@ struct mmu_psize_def { 
};

extern struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT];



/*

 * For BOOK3s 64 with 4k and 64K linux page size

 * we want to use pointers, because the page table

 * actually store pfn

 */

typedef pte_t *pgtable_t;



#endif /* __ASSEMBLY__ */



/* 64-bit classic hash table MMU */

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

+4 −0
Original line number Diff line number Diff line
@@ -16,4 +16,8 @@ 
#include <asm/nohash/32/mmu-8xx.h>

#endif



#ifndef __ASSEMBLY__

typedef struct page *pgtable_t;

#endif



#endif /* _ASM_POWERPC_NOHASH_32_MMU_H_ */

arch/powerpc/include/asm/nohash/64/mmu.h

+4 −0
Original line number Diff line number Diff line
@@ -5,4 +5,8 @@ 
/* Freescale Book-E software loaded TLB or Book-3e (ISA 2.06+) MMU */

#include <asm/nohash/mmu-book3e.h>



#ifndef __ASSEMBLY__

typedef struct page *pgtable_t;

#endif



#endif /* _ASM_POWERPC_NOHASH_64_MMU_H_ */

arch/powerpc/include/asm/page.h

+0 −14
Original line number Diff line number Diff line
@@ -335,20 +335,6 @@ void arch_free_page(struct page *page, int order); 
#endif



struct vm_area_struct;

#ifdef CONFIG_PPC_BOOK3S_64

/*

 * For BOOK3s 64 with 4k and 64K linux page size

 * we want to use pointers, because the page table

 * actually store pfn

 */

typedef pte_t *pgtable_t;

#else

#if defined(CONFIG_PPC_64K_PAGES) && defined(CONFIG_PPC64)

typedef pte_t *pgtable_t;

#else

typedef struct page *pgtable_t;

#endif

#endif



#include <asm-generic/memory_model.h>

#endif /* __ASSEMBLY__ */