mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/prom_init: Move prom_radix_disable to __prombss

Browse Source 
Initialize it dynamically instead of statically

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Benjamin Herrenschmidt
2018-10-15 13:49:54 +11:00
committed by Michael Ellerman
parent 11fdb30934
commit c886087cae
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/powerpc/kernel/prom_init.c
View File

@@ -172,7 +172,9 @@ static unsigned long __prombss prom_tce_alloc_start;
static unsigned long __prombss prom_tce_alloc_end; static unsigned long __prombss prom_tce_alloc_end;
#endif #endif
static bool prom_radix_disable __initdata = !IS_ENABLED(CONFIG_PPC_RADIX_MMU_DEFAULT); #ifdef CONFIG_PPC_PSERIES
static bool prom_radix_disable __prombss;
#endif
struct platform_support { struct platform_support {
bool hash_mmu; bool hash_mmu;
@@ -665,6 +667,8 @@ static void __init early_cmdline_parse(void)
#endif #endif
} }
#ifdef CONFIG_PPC_PSERIES
prom_radix_disable = !IS_ENABLED(CONFIG_PPC_RADIX_MMU_DEFAULT);
opt = strstr(prom_cmd_line, "disable_radix"); opt = strstr(prom_cmd_line, "disable_radix");
if (opt) { if (opt) {
opt += 13; opt += 13;
@@ -680,6 +684,7 @@ static void __init early_cmdline_parse(void)
} }
if (prom_radix_disable) if (prom_radix_disable)
prom_debug("Radix disabled from cmdline\n"); prom_debug("Radix disabled from cmdline\n");
#endif /* CONFIG_PPC_PSERIES */
} }
#ifdef CONFIG_PPC_PSERIES #ifdef CONFIG_PPC_PSERIES