On Thu, 28 Jul 2016 00:18:06 +1000 Michael Ellerman <m...@ellerman.id.au> wrote:
> Currently we have radix_enabled() three times, twice in > asm/book3s/64/mmu.h and then a fallback in asm/mmu.h. > > Consolidate them in asm/mmu.h. While we're at it convert them to be > static inlines, and change the fallback case to returning a bool, like > mmu_has_feature(). > > Signed-off-by: Michael Ellerman <m...@ellerman.id.au> > --- > arch/powerpc/include/asm/book3s/64/mmu.h | 7 ------- > arch/powerpc/include/asm/mmu.h | 16 ++++++++++++---- > 2 files changed, 12 insertions(+), 11 deletions(-) > > v3: New. > > diff --git a/arch/powerpc/include/asm/book3s/64/mmu.h > b/arch/powerpc/include/asm/book3s/64/mmu.h index > ad2d501cddcf..70c995870297 100644 --- > a/arch/powerpc/include/asm/book3s/64/mmu.h +++ > b/arch/powerpc/include/asm/book3s/64/mmu.h @@ -23,13 +23,6 @@ struct > mmu_psize_def { }; > extern struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT]; > > -#ifdef CONFIG_PPC_RADIX_MMU > -#define radix_enabled() mmu_has_feature(MMU_FTR_TYPE_RADIX) > -#else > -#define radix_enabled() (0) > -#endif > - > - > #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 eb942a446969..f413b3213a3b > 100644 --- a/arch/powerpc/include/asm/mmu.h > +++ b/arch/powerpc/include/asm/mmu.h > @@ -163,6 +163,18 @@ static inline void assert_pte_locked(struct > mm_struct *mm, unsigned long addr) } > #endif /* !CONFIG_DEBUG_VM */ > > +#ifdef CONFIG_PPC_RADIX_MMU > +static inline bool radix_enabled(void) > +{ > + return mmu_has_feature(MMU_FTR_TYPE_RADIX); > +} > +#else > +static inline bool radix_enabled(void) > +{ > + return false; > +} > +#endif Won't MMU_FTRS_POSSIBLE just do the right thing when !CONFIG_PPC_RADIX_MMU? Thanks, Nick _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev