Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261433AbUCPTXg (ORCPT ); Tue, 16 Mar 2004 14:23:36 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261437AbUCPTXb (ORCPT ); Tue, 16 Mar 2004 14:23:31 -0500 Received: from caramon.arm.linux.org.uk ([212.18.232.186]:1550 "EHLO caramon.arm.linux.org.uk") by vger.kernel.org with ESMTP id S261433AbUCPTWy (ORCPT ); Tue, 16 Mar 2004 14:22:54 -0500 Date: Tue, 16 Mar 2004 19:22:47 +0000 From: Russell King To: Linus Torvalds , Ian Campbell , netdev@oss.sgi.com, Linux Kernel Mailing List Subject: Re: [PATCH] Do not include linux/irq.h from linux/netpoll.h Message-ID: <20040316192247.A7886@flint.arm.linux.org.uk> Mail-Followup-To: Linus Torvalds , Ian Campbell , netdev@oss.sgi.com, Linux Kernel Mailing List References: <1079369568.19012.100.camel@icampbell-debian> <20040316001141.C29594@flint.arm.linux.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <20040316001141.C29594@flint.arm.linux.org.uk>; from rmk+lkml@arm.linux.org.uk on Tue, Mar 16, 2004 at 12:11:41AM +0000 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2527 Lines: 62 On Tue, Mar 16, 2004 at 12:11:41AM +0000, Russell King wrote: > On Mon, Mar 15, 2004 at 04:52:50PM +0000, Ian Campbell wrote: > > The culprit would appear to be the addition of a > > #include > > to net/core/dev.c which in turn pulls in which (as Russell > > King notes in a comment therein) should not be included from generic > > code. > > Linus - I haven't tested this patch myself yet, but I do think something > needs to happen with linux/irq.h. It seems a comment in the file isn't > sufficient. > > The file itself is misplaced and misleading sitting in the include/linux > subdirectory, which causes problems when people decide to include it into > architecture independent files, in the belief that it's a generic include > file. > > I believe that linux/irq.h should at least become asm-generic/irq.h to > stop this happening. > > What are your thoughts on this? So how do we solve this problem. Should I just merge this change and ask you to pull it? I think that's rather impolite though. Or should I send a BK cset which removes include/linux/irq.h entirely, thereby fixing _my_ problem (though it'll break everyone elses build.) 8) > Index: linux-2.6-bkpxa/include/linux/netpoll.h > =================================================================== > --- linux-2.6-bkpxa.orig/include/linux/netpoll.h 2004-03-15 15:03:30.000000000 +0000 > +++ linux-2.6-bkpxa/include/linux/netpoll.h 2004-03-15 16:24:25.000000000 +0000 > @@ -9,7 +9,6 @@ > > #include > #include > -#include > #include > > struct netpoll; > > -- > Russell King > Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ > maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/ > 2.6 Serial core > - > 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/ -- Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/ 2.6 Serial core - 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/