Commit 7353644f authored Jul 25, 2016 by Michael Ellerman

powerpc/mm: Fix build break when PPC_NATIVE=n



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: 166dd7d3 ("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>

parent ccf5c442

arch/powerpc/mm/hash_utils_64.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -931,9 +931,12 @@ void __init hash__early_init_mmu(void)
		ps3_early_mm_init();
		else if (firmware_has_feature(FW_FEATURE_LPAR))
		hpte_init_lpar();
		else
		else if IS_ENABLED(CONFIG_PPC_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
		* of memory. Has to be done before SLB initialization as this is
		* currently where the page size encoding is obtained.