In this patch we add the radix Kconfig and conditional check. radix_enabled is written to always return 0 here. Once we have all needed radix changes added, we will update this to mmu_feature check.
We need to addt this early so that we can get it all build in the early stage. Signed-off-by: Aneesh Kumar K.V <aneesh.ku...@linux.vnet.ibm.com> radix kconfig variable --- arch/powerpc/include/asm/book3s/64/mmu.h | 2 ++ arch/powerpc/include/asm/mmu.h | 3 +++ arch/powerpc/platforms/Kconfig.cputype | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/arch/powerpc/include/asm/book3s/64/mmu.h b/arch/powerpc/include/asm/book3s/64/mmu.h index b86786f2521c..593d9e3ce8e7 100644 --- a/arch/powerpc/include/asm/book3s/64/mmu.h +++ b/arch/powerpc/include/asm/book3s/64/mmu.h @@ -19,6 +19,8 @@ struct mmu_psize_def { unsigned long sllp; /* SLB L||LP (exact mask to use in slbmte) */ }; extern struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT]; + +#define radix_enabled() (0) #endif /* __ASSEMBLY__ */ /* 64-bit classic hash table MMU */ diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h index 5f55024f9522..decde4c4870d 100644 --- a/arch/powerpc/include/asm/mmu.h +++ b/arch/powerpc/include/asm/mmu.h @@ -204,6 +204,9 @@ static inline void assert_pte_locked(struct mm_struct *mm, unsigned long addr) # include <asm/mmu-8xx.h> #endif +#ifndef radix_enabled +#define radix_enabled() (0) +#endif #endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_MMU_H_ */ diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index 142dff5e96d6..53299182dba9 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype @@ -331,6 +331,10 @@ config PPC_STD_MMU_64 def_bool y depends on PPC_STD_MMU && PPC64 +config PPC_RADIX_MMU + def_bool y + depends on PPC_BOOK3S_64 + config PPC_MMU_NOHASH def_bool y depends on !PPC_STD_MMU -- 2.5.0 _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev