Re: [PATCH 0/5] Boot IRQ quirks and rerouting [repost]

[Ingo Molnar <mingo@elte.hu>]

* Ingo Molnar <mingo@elte.hu> wrote:

> * Stefan Assmann <sassmann@suse.de> wrote:
> 
> > These patches are against linux-2.6-tip, auto-x86-next.
> > 
> > The AMD/ATI and Broadcomm patches are not included yet, we're working 
> > on getting things ready for submission.
> > 
> > The patch for the bootirqquirk= parameter will be released later.
> 
> applied, thanks Stefan. I have created a new 
> tip/x86/pci-ioapic-boot-irq-quirks topic branch for this. Lets see how 
> these changes work out in practice.

-tip testing found the following build failure:

init/built-in.o: In function `nosmp':
main.c:(.init.text+0x14): undefined reference to `noioapicquirk'
main.c:(.init.text+0x1e): undefined reference to `noioapicreroute'
init/built-in.o: In function `maxcpus':
main.c:(.init.text+0x133): undefined reference to `noioapicquirk'
main.c:(.init.text+0x13d): undefined reference to `noioapicreroute'
arch/x86/kernel/built-in.o: In function `parse_noapic':
io_apic_32.c:(.init.text+0x7836): undefined reference to `noioapicquirk'
io_apic_32.c:(.init.text+0x7840): undefined reference to `noioapicreroute'

with this config:

  http://redhat.com/~mingo/misc/config-Wed_Jun_18_14_23_24_CEST_2008.bad

fixed via the patch below.

	Ingo

--------->
commit 7c01f5c8fc734cfbbdad3b389b88e1aa12c78e5b
Author: Ingo Molnar <mingo@elte.hu>
Date:   Wed Jun 18 14:47:09 2008 +0200

    x86: boot IRQ quirks and rerouting, fix
    
    fix:
    
    init/built-in.o: In function `nosmp':
    main.c:(.init.text+0x14): undefined reference to `noioapicquirk'
    main.c:(.init.text+0x1e): undefined reference to `noioapicreroute'
    init/built-in.o: In function `maxcpus':
    main.c:(.init.text+0x133): undefined reference to `noioapicquirk'
    main.c:(.init.text+0x13d): undefined reference to `noioapicreroute'
    arch/x86/kernel/built-in.o: In function `parse_noapic':
    io_apic_32.c:(.init.text+0x7836): undefined reference to `noioapicquirk'
    io_apic_32.c:(.init.text+0x7840): undefined reference to `noioapicreroute'
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/include/asm-x86/io_apic.h b/include/asm-x86/io_apic.h
index 5f68b1d..3086c26 100644
--- a/include/asm-x86/io_apic.h
+++ b/include/asm-x86/io_apic.h
@@ -157,8 +157,10 @@ extern int timer_through_8259;
 
 static inline void disable_ioapic_setup(void)
 {
+#ifdef CONFIG_PCI
 	noioapicquirk = 1;
 	noioapicreroute = -1;
+#endif
 	skip_ioapic_setup = 1;
 }