Messages in this thread Patch in this message | | | Date | Tue, 16 Mar 2004 19:22:47 +0000 | From | Russell King <> | Subject | Re: [PATCH] Do not include linux/irq.h from linux/netpoll.h |
| |
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 <linux/netpoll.h> > > to net/core/dev.c which in turn pulls in <linux/irq.h> 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 <linux/netdevice.h> > #include <linux/interrupt.h> > -#include <linux/irq.h> > #include <linux/list.h> > > 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/
| |