From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752801AbcGVGbv (ORCPT ); Fri, 22 Jul 2016 02:31:51 -0400 Received: from ozlabs.org ([103.22.144.67]:38343 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751020AbcGVGbt (ORCPT ); Fri, 22 Jul 2016 02:31:49 -0400 Date: Fri, 22 Jul 2016 16:31:47 +1000 From: Stephen Rothwell To: Michael Ellerman , Benjamin Herrenschmidt , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: linux-next: build failure after merge of the powerpc tree Message-ID: <20160722163147.73579b85@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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 --- 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