Subject: linux-next: build failure after merge of the powerpc tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 22 Jul 2016 16:31:47 +1000

Hi all,

After merging the powerpc tree, today's linux-next build (powerpc64
allnoconfig) failed like this:

arch/powerpc/mm/built-in.o: In function `.hash__early_init_mmu':
(.init.text+0x7d8): undefined reference to `.hpte_init_native'

Caused by commit

  166dd7d3fbf2 ("powerpc/64: Move MMU backend selection out of platform code")

hpte_init_native is in hash_native_64 which is only built for
CONFIG_PPC_NATIVE.  I added the following fix patch (which is probably
not correct).

From: Stephen Rothwell <[email-masked]>
Date: Fri, 22 Jul 2016 16:28:00 +1000
Subject: [PATCH] powerpc: fix for "Move MMU backend selection out of platform
 code"

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 arch/powerpc/mm/hash_utils_64.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 341632471b9d..7c50b4b79c84 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -931,8 +931,10 @@ void __init hash__early_init_mmu(void)
 		ps3_early_mm_init();
 	else if (firmware_has_feature(FW_FEATURE_LPAR))
 		hpte_init_lpar();
+#ifdef CONFIG_PPC_NATIVE
 	else
 		hpte_init_native();
+#endif
 
 	/* Initialize the MMU Hash table and create the linear mapping
 	 * of memory. Has to be done before SLB initialization as this is
-- 
2.8.1

-- 
Cheers,
Stephen Rothwell