On Thu, 2016-07-28 at 00:18 +1000, Michael Ellerman wrote:
> --- a/arch/powerpc/mm/hash_utils_64.c
> +++ b/arch/powerpc/mm/hash_utils_64.c
> @@ -530,7 +530,7 @@ static bool might_have_hea(void)
> * we will never see an HEA ethernet device.
> */
> #ifdef CONFIG_IBMEBUS
> - return !cpu_has_feature(CPU_FTR_ARCH_207S) &&
> + return !__cpu_has_feature(CPU_FTR_ARCH_207S) &&
> !firmware_has_feature(FW_FEATURE_SPLPAR);
> #else
All these could go if that function was split. The part that reads the
DT stays in early_init_mmu_devtree (bastically up to "found:" and then
the bit at the end that scans the huge pages).
The rest, which just assigns the various mmu_*_psize can go into
eary_init_mmu(). That means the only conversion needed is the one
below:
> return false;
> @@ -561,7 +561,7 @@ static void __init htab_init_page_sizes(void)
> * Not in the device-tree, let's fallback on known size
> * list for 16M capable GP & GR
> */
> - if (mmu_has_feature(MMU_FTR_16M_PAGE))
> + if (__mmu_has_feature(MMU_FTR_16M_PAGE))
> memcpy(mmu_psize_defs, mmu_psize_defaults_gp,
> sizeof(mmu_psize_defaults_gp));
> found:
And the rest can remain.
> @@ -591,7 +591,7 @@ found:
> mmu_vmalloc_psize = MMU_PAGE_64K;
> if (mmu_linear_psize == MMU_PAGE_4K)
> mmu_linear_psize = MMU_PAGE_64K;
> - if (mmu_has_feature(MMU_FTR_CI_LARGE_PAGE)) {
> + if (__mmu_has_feature(MMU_FTR_CI_LARGE_PAGE)) {
> /*
> * When running on pSeries using 64k pages
> for ioremap
> * would stop us accessing the HEA ethernet.
> So if we
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
