Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752025AbbFLAaY (ORCPT ); Thu, 11 Jun 2015 20:30:24 -0400 Received: from ozlabs.org ([103.22.144.67]:48850 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750980AbbFLAaW (ORCPT ); Thu, 11 Jun 2015 20:30:22 -0400 Message-ID: <1434069014.28544.1.camel@ellerman.id.au> Subject: linux-next: build failure after merge of the arm-soc tree From: Michael Ellerman To: Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org Cc: linux-next@vger.kernel.org, Linux Kernel Mailing List , khilman@linaro.org, dinguyen@opensource.altera.com, rmk+kernel@arm.linux.org.uk Date: Fri, 12 Jun 2015 10:30:14 +1000 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.12.10-0ubuntu1~14.10.1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1463 Lines: 39 Hi all, After merging the arm-soc tree, today's linux-next build (arm_multi_v7_defconfig) failed like this: scripts/Makefile.build:258: recipe for target 'arch/arm/mach-socfpga/platsmp.o' failed arch/arm/mach-socfpga/platsmp.c:66:23: error: 'socfpga_secondary_startup' undeclared (first use in this function) writel(virt_to_phys(socfpga_secondary_startup), ^ Caused by the interaction of commits 45be0cdb5323 "ARM: socfpga: add CPU_METHOD_OF_DECLARE for Arria 10" and 02b4e2756e01 "ARM: v7 setup function should invalidate L1 cache". I applied the following fix for today. diff --git a/arch/arm/mach-socfpga/platsmp.c b/arch/arm/mach-socfpga/platsmp.c index 4d2ad3d31f7b..c6f1df89f9af 100644 --- a/arch/arm/mach-socfpga/platsmp.c +++ b/arch/arm/mach-socfpga/platsmp.c @@ -63,7 +63,7 @@ static int socfpga_a10_boot_secondary(unsigned int cpu, struct task_struct *idle SOCFPGA_A10_RSTMGR_MODMPURST); memcpy(phys_to_virt(0), &secondary_trampoline, trampoline_size); - writel(virt_to_phys(socfpga_secondary_startup), + writel(virt_to_phys(secondary_startup), sys_manager_base_addr + (socfpga_cpu1start_addr & 0x00000fff)); flush_cache_all(); cheers -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/