Re: 2.6.20-mm2

[Jean Delvare <khali@linux-fr.org>]

Hi Andrew,

On Tue, 27 Feb 2007 12:25:51 -0800, Andrew Morton wrote:
> > On Sun, 25 Feb 2007 14:15:30 +0100 Jean Delvare <khali@linux-fr.org> wrote:
> > Hi Andrew, all,
> > 
> > I appear to need the following fix to be able to build 2.6.20-mm2 on
> > x86_64. Without the fix, my build attempt dies on:
> > 
> > In file included from drivers/pci/quirks.c:532:
> > include/asm/io_apic.h:61: error: "MAX_IO_APICS" undeclared here (not in a function)
> > 
> > Not sure how nobody else was bitten by this one yet... i386 seems to
> > need the same so I've fixed it as well.
> > 
> > Signed-off-by: Jean Delvare <khali@linux-fr.org>
> > ---
> >  include/asm-i386/io_apic.h   |    1 +
> >  include/asm-x86_64/io_apic.h |    1 +
> >  2 files changed, 2 insertions(+)
> > 
> > --- linux-2.6.20.orig/include/asm-i386/io_apic.h	2007-02-25 13:01:40.000000000 +0100
> > +++ linux-2.6.20/include/asm-i386/io_apic.h	2007-02-25 14:01:33.000000000 +0100
> > @@ -3,6 +3,7 @@
> >  
> >  #include <asm/types.h>
> >  #include <asm/mpspec.h>
> > +#include <asm/apicdef.h>
> >  
> >  /*
> >   * Intel IO-APIC support for SMP and UP systems.
> > --- linux-2.6.20.orig/include/asm-x86_64/io_apic.h	2007-02-25 13:01:43.000000000 +0100
> > +++ linux-2.6.20/include/asm-x86_64/io_apic.h	2007-02-25 13:54:31.000000000 +0100
> > @@ -3,6 +3,7 @@
> >  
> >  #include <asm/types.h>
> >  #include <asm/mpspec.h>
> > +#include <asm/apicdef.h>
> >  
> >  /*
> >   * Intel IO-APIC support for SMP and UP systems.
> > 
> 
> erk.
> 
> My problem is that I need to work out which patch in -mm broke the build so
> that I can insert this patch in the appropriate position.
> 
> Can you please send the offending .config so I can do that?

I've bisected myself 2.6.20-mm2 instead. And the winners are:
x86_64-mm-adjust-inclusion-of-asm-fixmap_h.patch
x86_64-mm-adjust-inclusion-of-asm-vsyscall32_h.patch

The former breaks the compilation in a different way. The latter fixes
it but causes the breakage I reported originally.

Does it really matter anyway? Even in mainline,
include/asm-x86_64/io_apic.h uses MAX_IO_APICS, so it should include
the header file which defines it, that is <asm/apicdef.h>. It doesn't,
that's a bug, let's just fix it. Same for i386. So what about pushing
my patch to Linus right away?

Thanks,
-- 
Jean Delvare