diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2016-07-26 13:31:59 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-08-01 03:14:54 +0200 |
| commit | bacf9cf88303c0df5794ca45dd9f297740a00913 (patch) | |
| tree | 29b1d7e5cbb80181a450902089e245e9e9fe950d /arch/powerpc/mm/init_64.c | |
| parent | powerpc/mm: Move disable_radix handling into mmu_early_init_devtree() (diff) | |
| download | linux-bacf9cf88303c0df5794ca45dd9f297740a00913.tar.xz linux-bacf9cf88303c0df5794ca45dd9f297740a00913.zip | |
powerpc/mm: Do hash device tree scanning earlier
Currently MMU initialisation (early_init_mmu()) consists of a mixture of
scanning the device tree, setting MMU feature bits, and then also doing
actual initialisation of MMU data structures.
We'd like to decouple the setting of the MMU features from the actual
setup. So split out the device tree scanning, and associated code, and
call it from mmu_init_early_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.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index 0d51e6e25db5..d023333c6c9a 100644 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c @@ -426,5 +426,8 @@ void __init mmu_early_init_devtree(void) /* Disable radix mode based on kernel command line. */ if (disable_radix) cur_cpu_spec->mmu_features &= ~MMU_FTR_RADIX; + + if (!radix_enabled()) + hash__early_init_devtree(); } #endif /* CONFIG_PPC_STD_MMU_64 */ |