diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-x86/io_apic.h | 4 | ||||
-rw-r--r-- | include/asm-x86/pci.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-x86/io_apic.h b/include/asm-x86/io_apic.h index 14f82bbcb5fd..8ca0110819f4 100644 --- a/include/asm-x86/io_apic.h +++ b/include/asm-x86/io_apic.h | |||
@@ -157,11 +157,15 @@ extern int sis_apic_bug; | |||
157 | /* 1 if "noapic" boot option passed */ | 157 | /* 1 if "noapic" boot option passed */ |
158 | extern int skip_ioapic_setup; | 158 | extern int skip_ioapic_setup; |
159 | 159 | ||
160 | /* 1 if "noapic" boot option passed */ | ||
161 | extern int noioapicquirk; | ||
162 | |||
160 | /* 1 if the timer IRQ uses the '8259A Virtual Wire' mode */ | 163 | /* 1 if the timer IRQ uses the '8259A Virtual Wire' mode */ |
161 | extern int timer_through_8259; | 164 | extern int timer_through_8259; |
162 | 165 | ||
163 | static inline void disable_ioapic_setup(void) | 166 | static inline void disable_ioapic_setup(void) |
164 | { | 167 | { |
168 | noioapicquirk = 1; | ||
165 | skip_ioapic_setup = 1; | 169 | skip_ioapic_setup = 1; |
166 | } | 170 | } |
167 | 171 | ||
diff --git a/include/asm-x86/pci.h b/include/asm-x86/pci.h index 2db14cf17db8..30eec93a845e 100644 --- a/include/asm-x86/pci.h +++ b/include/asm-x86/pci.h | |||
@@ -19,6 +19,7 @@ struct pci_sysdata { | |||
19 | }; | 19 | }; |
20 | 20 | ||
21 | extern int pci_routeirq; | 21 | extern int pci_routeirq; |
22 | extern int noioapicquirk; | ||
22 | 23 | ||
23 | /* scan a bus after allocating a pci_sysdata for it */ | 24 | /* scan a bus after allocating a pci_sysdata for it */ |
24 | extern struct pci_bus *pci_scan_bus_on_node(int busno, struct pci_ops *ops, | 25 | extern struct pci_bus *pci_scan_bus_on_node(int busno, struct pci_ops *ops, |