From patchwork Tue Jul 28 02:43:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 6879121 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 665FB9F39D for ; Tue, 28 Jul 2015 02:45:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8CE2E20674 for ; Tue, 28 Jul 2015 02:45:41 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AB0A120520 for ; Tue, 28 Jul 2015 02:45:40 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZJuru-0001XR-6f; Tue, 28 Jul 2015 02:43:50 +0000 Received: from ozlabs.org ([103.22.144.67]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZJurr-0001V0-7e for linux-arm-kernel@lists.infradead.org; Tue, 28 Jul 2015 02:43:47 +0000 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id D872D14018C; Tue, 28 Jul 2015 12:43:24 +1000 (AEST) Date: Tue, 28 Jul 2015 12:43:24 +1000 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Jason Cooper , , , 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150727_194347_433653_75840589 X-CRM114-Status: GOOD ( 12.05 ) X-Spam-Score: -4.2 (----) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Sudeep Holla Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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();