Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751375Ab3FZF2l (ORCPT ); Wed, 26 Jun 2013 01:28:41 -0400 Received: from mga03.intel.com ([143.182.124.21]:54960 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750826Ab3FZF2k (ORCPT ); Wed, 26 Jun 2013 01:28:40 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,941,1363158000"; d="scan'208";a="322674284" Date: Wed, 26 Jun 2013 10:18:42 +0530 From: Vinod Koul To: Russell King - ARM Linux Cc: Jonathan Austin , "linux-kernel@vger.kernel.org" , Steve Capper , Catalin Marinas , linus.walleij@linaro.org, Will Deacon , Al Viro , "linux-arm-kernel@lists.infradead.org" Subject: Re: amba-pl08x and 'get_signal' namespace collision/build error Message-ID: <20130626044842.GR23141@intel.com> References: <51C97F40.5030101@arm.com> <20130625184539.GB2718@n2100.arm.linux.org.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20130625184539.GB2718@n2100.arm.linux.org.uk> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1680 Lines: 42 On Tue, Jun 25, 2013 at 07:45:39PM +0100, Russell King - ARM Linux wrote: > 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: > > 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 > > 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. Yup. This is fixed in slave-dma tree by a patch from mark by renaming it. This should not show in the -next tree -- ~Vinod -- 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/