powerpc/mm/radix: Add radix callbacks for early init routines

[cascardo/linux.git] / arch / powerpc / platforms / powernv / setup.c

diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
index 1acb0c7..ee6430b 100644 (file)
--- a/arch/powerpc/platforms/powernv/setup.c
+++ b/arch/powerpc/platforms/powernv/setup.c
@@ -273,7 +273,10 @@ static int __init pnv_probe(void)
        if (!of_flat_dt_is_compatible(root, "ibm,powernv"))
                return 0;
 
-       hpte_init_native();
+       if (IS_ENABLED(CONFIG_PPC_RADIX_MMU) && radix_enabled())
+               radix_init_native();
+       else if (IS_ENABLED(CONFIG_PPC_STD_MMU_64))
+               hpte_init_native();
 
        if (firmware_has_feature(FW_FEATURE_OPAL))
                pnv_setup_machdep_opal();