summaryrefslogtreecommitdiff
path: root/arch/powerpc/mm/init_64.c
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2016-07-26 21:55:27 +1000
committerMichael Ellerman <mpe@ellerman.id.au>2016-08-01 11:14:55 +1000
commit2537b09c939fca26447f0ac3e688691de06eadda (patch)
tree18a5143d6114ab849d91e85eda6d81416a767d37 /arch/powerpc/mm/init_64.c
parentbacf9cf88303c0df5794ca45dd9f297740a00913 (diff)
powerpc/mm: Do radix device tree scanning earlier
Like we just did for hash, split the device tree scanning parts out and call them from mmu_early_init_devtree(). Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/mm/init_64.c')
-rw-r--r--arch/powerpc/mm/init_64.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index d023333c6c9a..e0ab33d20a10 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -427,7 +427,9 @@ void __init mmu_early_init_devtree(void)
if (disable_radix)
cur_cpu_spec->mmu_features &= ~MMU_FTR_RADIX;
- if (!radix_enabled())
+ if (radix_enabled())
+ radix__early_init_devtree();
+ else
hash__early_init_devtree();
}
#endif /* CONFIG_PPC_STD_MMU_64 */