OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc/mm: Fix build break when PPC_NATIVE=n

Browse Source 
The recent commit to rework the hash MMU setup broke the build when
CONFIG_PPC_NATIVE=n. Fix it by adding an IS_ENABLED() check before
calling hpte_init_native().

Removing the else clause opens the possibility that we don't set any
ops, which would probably lead to a strange crash later. So add a check
that we correctly initialised at least one member of the struct.

Fixes: 166dd7d3fb ("powerpc/64: Move MMU backend selection out of platform code")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Michael Ellerman 2016-07-25 11:54:41 +10:00
parent ccf5c442a1
commit 7353644fa9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/mm/hash_utils_64.c
View File

@ -931,9 +931,12 @@ void __init hash__early_init_mmu(void)
ps3_early_mm_init(); ps3_early_mm_init();
else if (firmware_has_feature(FW_FEATURE_LPAR)) else if (firmware_has_feature(FW_FEATURE_LPAR))
hpte_init_lpar(); hpte_init_lpar();
else else if IS_ENABLED(CONFIG_PPC_NATIVE)
hpte_init_native(); hpte_init_native();
if (!mmu_hash_ops.hpte_insert)
panic("hash__early_init_mmu: No MMU hash ops defined!\n");
/* Initialize the MMU Hash table and create the linear mapping /* Initialize the MMU Hash table and create the linear mapping
* of memory. Has to be done before SLB initialization as this is * of memory. Has to be done before SLB initialization as this is
* currently where the page size encoding is obtained. * currently where the page size encoding is obtained.