diff options
| author | Len Brown <len.brown@intel.com> | 2007-08-24 22:19:05 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-08-24 22:19:05 -0400 |
| commit | 5a16eff86dc1194a17c69250492e820d828e3bde (patch) | |
| tree | a0f990ce8682d7108f6fbd7f9d3c90a8d318d9b8 /include | |
| parent | 2e0f4c7b383063abc274c4a088043383a3735b93 (diff) | |
| parent | 61ec7567db103d537329b0db9a887db570431ff4 (diff) | |
| download | linux-5a16eff86dc1194a17c69250492e820d828e3bde.tar.gz linux-5a16eff86dc1194a17c69250492e820d828e3bde.tar.bz2 linux-5a16eff86dc1194a17c69250492e820d828e3bde.zip | |
Pull bugzilla-1641 into release branch
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/io_apic.h | 1 | ||||
| -rw-r--r-- | include/asm-x86_64/io_apic.h | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/asm-i386/io_apic.h b/include/asm-i386/io_apic.h index 340764076d5f..dbe734ddf2af 100644 --- a/include/asm-i386/io_apic.h +++ b/include/asm-i386/io_apic.h @@ -150,7 +150,6 @@ extern int (*ioapic_renumber_irq)(int ioapic, int irq); #else /* !CONFIG_X86_IO_APIC */ #define io_apic_assign_pci_irqs 0 -static inline void disable_ioapic_setup(void) { } #endif #endif diff --git a/include/asm-x86_64/io_apic.h b/include/asm-x86_64/io_apic.h index 969d225a9350..d9f2e54324d5 100644 --- a/include/asm-x86_64/io_apic.h +++ b/include/asm-x86_64/io_apic.h @@ -109,6 +109,12 @@ extern int mpc_default_type; /* 1 if "noapic" boot option passed */ extern int skip_ioapic_setup; +static inline void disable_ioapic_setup(void) +{ + skip_ioapic_setup = 1; +} + + /* * If we use the IO-APIC for IRQ routing, disable automatic * assignment of PCI IRQ's. |