From patchwork Fri Nov 28 16:49:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Cooper X-Patchwork-Id: 5405111 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C4019BEEA8 for ; Fri, 28 Nov 2014 16:53:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9DCF42015E for ; Fri, 28 Nov 2014 16:53:06 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4E283201B4 for ; Fri, 28 Nov 2014 16:53:05 +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 1XuOkp-0002Ve-JU; Fri, 28 Nov 2014 16:50:47 +0000 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XuOkC-0000ji-HS for linux-arm-kernel@lists.infradead.org; Fri, 28 Nov 2014 16:50:09 +0000 Received: from pool-96-249-243-124.nrflva.fios.verizon.net ([96.249.243.124] helo=titan) by mho-02-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1XuOjq-0000f8-JD; Fri, 28 Nov 2014 16:49:46 +0000 Received: from titan.lakedaemon.net (localhost [127.0.0.1]) by titan (Postfix) with ESMTP id DADEE6263C1; Fri, 28 Nov 2014 11:49:44 -0500 (EST) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 96.249.243.124 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX19Qvo0NvAMUjy4BR6VQegT3hjUIIKwK4UY= X-DKIM: OpenDKIM Filter v2.0.1 titan DADEE6263C1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lakedaemon.net; s=mail; t=1417193384; bh=tPyPVtF8hKHrFSyEeUVDqiJypOd/4hvFdcZ7GpeZJfU=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:In-Reply-To; b=N5qHHuKOdXSSa5EjC8Z9YYpT9OCMN1oHfCPMKxuzgdxELLKCqDSVL5HSnT6CFWzVg Jjou/0p4EuDUPhg3sWKxK7jvyvp5+E539h+R5bViL+u9opiNl6QGa7kYNGopHi3snS CN9184NVLOGCYPIaCcSag+j7kMug/bqWrba0nQV+ajrujQt4rroStFHn/RO+z53r4d 3atEuSe850Kk9kY5kaaNFhduKL8hRA2QRuww3qeY99t3GJ5MO8sSfpN2fyHuiMAHnq JkiVbNWlt87nP3rP87nbErt012QGPMPz5caqiBqlOrnmSabx3LM9XSCvJGy6f9xJew teB0xX3riBMJw== Date: Fri, 28 Nov 2014 11:49:44 -0500 From: Jason Cooper To: Marc Zyngier Subject: Re: [PATCH NEXT] irqchip: gic: fix compilation of asm code depending on arm-gic.h Message-ID: <20141128164944.GP22670@titan.lakedaemon.net> References: <1417170975-1163-1-git-send-email-marc.zyngier@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1417170975-1163-1-git-send-email-marc.zyngier@arm.com> User-Agent: Mutt/1.5.20 (2009-06-14) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141128_085008_776179_BF74E594 X-CRM114-Status: GOOD ( 16.54 ) X-Spam-Score: -0.1 (/) Cc: Will Deacon , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Marc, On Fri, Nov 28, 2014 at 10:36:15AM +0000, Marc Zyngier wrote: > Commit 01f17a66be97 (irqchip: gic: Remove warning by including > linux/irqdomain.h) indeed fixed an annoying warning in the ARM > code, but also broke the compilation of arm64 defconfig and > any other defconfig that includes KVM support in a rather > spectacular way: > > http://lists.linaro.org/pipermail/kernel-build-reports/2014-November/006475.html > > Moving the #include directive to a spot that is not going to > be used by assembly code fixes the issue. > > Cc: Jason Cooper > Cc: Will Deacon > Signed-off-by: Marc Zyngier > --- > include/linux/irqchip/arm-gic.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) I squashed this into the original fix with your S-o-b, and Will's Ack. Pushing to irqchip/for-next shortly. thx, Jason. ------------8<---------------------- commit df870c78848aac4d953f61a8926a792de8133b9e Author: Jason Cooper Date: Thu Nov 27 18:27:49 2014 +0000 irqchip: gic: Remove warning by including linux/irqdomain.h Commit 853a33ce6932 irqchip: gic-v2m: Add support for ARM GICv2m MSI(-X) doorbell Introduced a series of warnings when building ARM multi_v7_defconfig: include/linux/irqchip/arm-gic.h:109:53: warning: its scope is only this definition or declaration, which is probably not what you want In file included from arch/arm/mach-ux500/pm.c:13:0: include/linux/irqchip/arm-gic.h:109:53: warning: 'struct irq_domain' declared inside parameter list int gicv2m_of_init(struct device_node *node, struct irq_domain *parent); ^ Fix this by adding the proper include. Signed-off-by: Jason Cooper [ jac merged much more correct version from Marc into this patch ] Signed-off-by: Marc Zyngier Acked-by: Will Deacon Link: https://lkml.kernel.org/r/1417170975-1163-1-git-send-email-marc.zyngier@arm.com Signed-off-by: Jason Cooper diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h index 60b09ed58cae..71d706d5f169 100644 --- a/include/linux/irqchip/arm-gic.h +++ b/include/linux/irqchip/arm-gic.h @@ -91,6 +91,8 @@ #ifndef __ASSEMBLY__ +#include + struct device_node; extern struct irq_chip gic_arch_extn;