diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2018-10-14 22:49:54 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-10-18 09:56:17 -0400 |
commit | c886087caee759790db47f345f8382d653015de3 (patch) | |
tree | 6f0b8ad6acecc8876e60ac0ed60fa3266fe92eed | |
parent | 11fdb309341ca1ba2e3d03fd1c9c0c6aedaea0b6 (diff) |
powerpc/prom_init: Move prom_radix_disable to __prombss
Initialize it dynamically instead of statically
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r-- | arch/powerpc/kernel/prom_init.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 84f763e0fe1d..7a5eb0192562 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c | |||
@@ -172,7 +172,9 @@ static unsigned long __prombss prom_tce_alloc_start; | |||
172 | static unsigned long __prombss prom_tce_alloc_end; | 172 | static unsigned long __prombss prom_tce_alloc_end; |
173 | #endif | 173 | #endif |
174 | 174 | ||
175 | static bool prom_radix_disable __initdata = !IS_ENABLED(CONFIG_PPC_RADIX_MMU_DEFAULT); | 175 | #ifdef CONFIG_PPC_PSERIES |
176 | static bool prom_radix_disable __prombss; | ||
177 | #endif | ||
176 | 178 | ||
177 | struct platform_support { | 179 | struct platform_support { |
178 | bool hash_mmu; | 180 | bool hash_mmu; |
@@ -665,6 +667,8 @@ static void __init early_cmdline_parse(void) | |||
665 | #endif | 667 | #endif |
666 | } | 668 | } |
667 | 669 | ||
670 | #ifdef CONFIG_PPC_PSERIES | ||
671 | prom_radix_disable = !IS_ENABLED(CONFIG_PPC_RADIX_MMU_DEFAULT); | ||
668 | opt = strstr(prom_cmd_line, "disable_radix"); | 672 | opt = strstr(prom_cmd_line, "disable_radix"); |
669 | if (opt) { | 673 | if (opt) { |
670 | opt += 13; | 674 | opt += 13; |
@@ -680,6 +684,7 @@ static void __init early_cmdline_parse(void) | |||
680 | } | 684 | } |
681 | if (prom_radix_disable) | 685 | if (prom_radix_disable) |
682 | prom_debug("Radix disabled from cmdline\n"); | 686 | prom_debug("Radix disabled from cmdline\n"); |
687 | #endif /* CONFIG_PPC_PSERIES */ | ||
683 | } | 688 | } |
684 | 689 | ||
685 | #ifdef CONFIG_PPC_PSERIES | 690 | #ifdef CONFIG_PPC_PSERIES |