diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-27 11:30:05 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-27 11:30:05 +0100 |
| commit | 34bf5d0ff54d03f0a8ed690d47efb806ee2fffcb (patch) | |
| tree | 5465f999b2b067744220b66c89b75f0f10445d6e /arch/x86/include/asm/io_apic.h | |
| parent | bd8b96dfc216eebc72950a6c40da8d3eca8667df (diff) | |
| parent | 79a66b96c339626a3e4b226fefc0e45244cfe6ff (diff) | |
Merge branch 'x86/core' into x86/cleanups
Diffstat (limited to 'arch/x86/include/asm/io_apic.h')
| -rw-r--r-- | arch/x86/include/asm/io_apic.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h index 6afd9933a7dd..e475e009ae5d 100644 --- a/arch/x86/include/asm/io_apic.h +++ b/arch/x86/include/asm/io_apic.h @@ -156,11 +156,21 @@ extern int sis_apic_bug; /* 1 if "noapic" boot option passed */ extern int skip_ioapic_setup; +/* 1 if "noapic" boot option passed */ +extern int noioapicquirk; + +/* -1 if "noapic" boot option passed */ +extern int noioapicreroute; + /* 1 if the timer IRQ uses the '8259A Virtual Wire' mode */ extern int timer_through_8259; static inline void disable_ioapic_setup(void) { +#ifdef CONFIG_PCI + noioapicquirk = 1; + noioapicreroute = -1; +#endif skip_ioapic_setup = 1; } |