diff options
| author | Michael Ellerman | 2016-07-26 13:29:30 +0200 |
|---|---|---|
| committer | Michael Ellerman | 2016-08-01 03:14:53 +0200 |
| commit | c610ec60ed6354157ea7b0c9c9a7236126ef416b (patch) | |
| tree | 69b5697e844b7dfd35bdb240a64d9d5b3bf2a29f | |
| parent | powerpc/mm: Add mmu_early_init_devtree() (diff) | |
| download | kernel-qcow2-linux-c610ec60ed6354157ea7b0c9c9a7236126ef416b.tar.gz kernel-qcow2-linux-c610ec60ed6354157ea7b0c9c9a7236126ef416b.tar.xz kernel-qcow2-linux-c610ec60ed6354157ea7b0c9c9a7236126ef416b.zip | |
powerpc/mm: Move disable_radix handling into mmu_early_init_devtree()
Move the handling of the disable_radix command line argument into the
newly created mmu_early_init_devtree().
It's an MMU option so it's preferable to have it in an mm related file,
and it also means platforms that don't support radix don't have to carry
the code.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
| -rw-r--r-- | arch/powerpc/kernel/prom.c | 13 | ||||
| -rw-r--r-- | arch/powerpc/mm/init_64.c | 11 |
2 files changed, 11 insertions, 13 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 9686984e79c4..b4b6952e8991 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -647,14 +647,6 @@ static void __init early_reserve_mem(void) #endif } -static bool disable_radix; -static int __init parse_disable_radix(char *p) -{ - disable_radix = true; - return 0; -} -early_param("disable_radix", parse_disable_radix); - void __init early_init_devtree(void *params) { phys_addr_t limit; @@ -744,11 +736,6 @@ void __init early_init_devtree(void *params) */ spinning_secondaries = boot_cpu_count - 1; #endif - /* - * now fixup radix MMU mode based on kernel command line - */ - if (disable_radix) - cur_cpu_spec->mmu_features &= ~MMU_FTR_RADIX; mmu_early_init_devtree(); diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index d0fb33ac3db2..0d51e6e25db5 100644 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c @@ -413,7 +413,18 @@ EXPORT_SYMBOL_GPL(realmode_pfn_to_page); #endif /* CONFIG_SPARSEMEM_VMEMMAP/CONFIG_FLATMEM */ #ifdef CONFIG_PPC_STD_MMU_64 +static bool disable_radix; +static int __init parse_disable_radix(char *p) +{ + disable_radix = true; + return 0; +} +early_param("disable_radix", parse_disable_radix); + 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; } #endif /* CONFIG_PPC_STD_MMU_64 */ |