Skip to content

Commit

Permalink
powerpc/mm: Define radix_enabled() in one place & use static inline
Browse files Browse the repository at this point in the history
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 <mpe@ellerman.id.au>
  • Loading branch information
Michael Ellerman committed Aug 1, 2016
1 parent 6574ba9 commit bab4c8d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
7 changes: 0 additions & 7 deletions arch/powerpc/include/asm/book3s/64/mmu.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
16 changes: 12 additions & 4 deletions arch/powerpc/include/asm/mmu.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

#endif /* !__ASSEMBLY__ */

/* The kernel use the constants below to index in the page sizes array.
Expand Down Expand Up @@ -230,9 +242,5 @@ static inline void mmu_early_init_devtree(void) { }
# include <asm/mmu-8xx.h>
#endif

#ifndef radix_enabled
#define radix_enabled() (0)
#endif

#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_MMU_H_ */

0 comments on commit bab4c8d

Please sign in to comment.