From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755208AbbG1Cn1 (ORCPT ); Mon, 27 Jul 2015 22:43:27 -0400 Received: from ozlabs.org ([103.22.144.67]:38857 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754849AbbG1Cn0 (ORCPT ); Mon, 27 Jul 2015 22:43:26 -0400 Date: Tue, 28 Jul 2015 12:43:24 +1000 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Jason Cooper , , , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Sudeep Holla Subject: linux-next: build failure after merge of the tip tree Message-ID: <20150728124324.40f44f01@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.28; i586-pc-linux-gnu) 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 tip tree, today's linux-next build (arm multi_v7_defconfig) failed like this: arch/arm/mach-mvebu/board-v7.c: In function 'mvebu_init_irq': arch/arm/mach-mvebu/board-v7.c:138:3: error: implicit declaration of function 'gic_set_irqchip_flags' [-Werror=implicit-function-declaration] gic_set_irqchip_flags(IRQCHIP_SKIP_SET_WAKE | ^ Caused by commit e6f134f8e30e ("ARM: mvebu: Allow using the GIC for wakeup in standby mode") from the mvebu tree interacting with commit 0d3f2c92e004 ("irqchip/gic: Remove redundant gic_set_irqchip_flags") from the tip tree. I have applied the following merge fix patch for today: From: Stephen Rothwell Date: Tue, 28 Jul 2015 12:26:21 +1000 Subject: [PATCH] irqchip/gic: merge fix for "Remove redundant gic_set_irqchip_flags" Signed-off-by: Stephen Rothwell --- arch/arm/mach-mvebu/board-v7.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/arch/arm/mach-mvebu/board-v7.c b/arch/arm/mach-mvebu/board-v7.c index a6d2b4d6701a..b5ef80f369e7 100644 --- a/arch/arm/mach-mvebu/board-v7.c +++ b/arch/arm/mach-mvebu/board-v7.c @@ -131,13 +131,6 @@ static int armada_375_external_abort_wa(unsigned long addr, unsigned int fsr, static void __init mvebu_init_irq(void) { - struct device_node *np; - - np = of_find_compatible_node(NULL, NULL, "arm,cortex-a9-gic"); - if (np) - gic_set_irqchip_flags(IRQCHIP_SKIP_SET_WAKE | - IRQCHIP_MASK_ON_SUSPEND); - of_node_put(np); irqchip_init(); mvebu_scu_enable(); coherency_init(); -- 2.4.6 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au