From patchwork Tue Jun 25 18:45:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King - ARM Linux X-Patchwork-Id: 2778941 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AFCCE9F3A0 for ; Tue, 25 Jun 2013 18:46:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8A33C20141 for ; Tue, 25 Jun 2013 18:46:23 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7A0FF2010E for ; Tue, 25 Jun 2013 18:46:22 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UrYFs-00028i-PE; Tue, 25 Jun 2013 18:46:17 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UrYFq-0000Pp-BC; Tue, 25 Jun 2013 18:46:14 +0000 Received: from caramon.arm.linux.org.uk ([78.32.30.218]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UrYFm-0000Oz-TM for linux-arm-kernel@lists.infradead.org; Tue, 25 Jun 2013 18:46:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=caramon; h=Sender:In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date; bh=GRj3TYYszv0GtI8HgnXLhraNxz81Dq91Yh2kG60+yxs=; b=EGa2J7WtPWGYLPIXsIPJfo7+C3Gt5wzG9z1afvcP/2MdGV0ijD2weyn67+qAiOyqoJqszLXzhV/DFOa7Mfw0pul316pe1E+3Sw4NOCazJRwk8fHfZCQAcbGh5oVzdViFCAc1Src3LAcl7LCa/VdYbJxrX/f3DGgduXZQmAJDJL8=; Received: from n2100.arm.linux.org.uk ([2002:4e20:1eda:1:214:fdff:fe10:4f86]:36609) by caramon.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1UrYFI-0008C4-Vi; Tue, 25 Jun 2013 19:45:41 +0100 Received: from linux by n2100.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1UrYFH-0002OJ-OD; Tue, 25 Jun 2013 19:45:39 +0100 Date: Tue, 25 Jun 2013 19:45:39 +0100 From: Russell King - ARM Linux To: Jonathan Austin Subject: Re: amba-pl08x and 'get_signal' namespace collision/build error Message-ID: <20130625184539.GB2718@n2100.arm.linux.org.uk> References: <51C97F40.5030101@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <51C97F40.5030101@arm.com> User-Agent: Mutt/1.5.19 (2009-01-05) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130625_144611_307039_9035DF04 X-CRM114-Status: GOOD ( 14.80 ) X-Spam-Score: -5.6 (-----) Cc: Steve Capper , Vinod Koul , Catalin Marinas , linus.walleij@linaro.org, Will Deacon , "linux-kernel@vger.kernel.org" , Al Viro , "linux-arm-kernel@lists.infradead.org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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=-5.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 On Tue, Jun 25, 2013 at 12:30:08PM +0100, Jonathan Austin wrote: > There's a patch making its way to mainline via Russell's tree > (8d96250700: ARM: mm: Transparent huge page support for LPAE systems) > that breaks the build of the amba-pl08x driver (drivers/dma/amba-pl08x.c) > because the 'get_signal' macro from include/linux/signal.h is now in the > driver's scope and it clobbers a (previously) valid function call. Well, here's the change to asm/pgtable.h in that patch: And the question is - if that's all that is going on in that file, why is asm/tlbflush.h being added to it? What in _that_ file uses anything from asm/tlbflush.h (nothing apparantly from what I can see)? So, I'm tempted to kill this change off unless someone can justify why that addition happened - it looks completely inappropriate to me. diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h index 9bcd262..eaedce7 100644 --- a/arch/arm/include/asm/pgtable.h +++ b/arch/arm/include/asm/pgtable.h @@ -24,6 +24,9 @@ #include #include + +#include + #ifdef CONFIG_ARM_LPAE #include #else