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 8ca0110819f4..a39670ae17df 100644 --- a/include/asm-x86/io_apic.h +++ b/include/asm-x86/io_apic.h | |||
@@ -160,12 +160,16 @@ extern int skip_ioapic_setup; | |||
160 | /* 1 if "noapic" boot option passed */ | 160 | /* 1 if "noapic" boot option passed */ |
161 | extern int noioapicquirk; | 161 | extern int noioapicquirk; |
162 | 162 | ||
163 | /* -1 if "noapic" boot option passed */ | ||
164 | extern int noioapicreroute; | ||
165 | |||
163 | /* 1 if the timer IRQ uses the '8259A Virtual Wire' mode */ | 166 | /* 1 if the timer IRQ uses the '8259A Virtual Wire' mode */ |
164 | extern int timer_through_8259; | 167 | extern int timer_through_8259; |
165 | 168 | ||
166 | static inline void disable_ioapic_setup(void) | 169 | static inline void disable_ioapic_setup(void) |
167 | { | 170 | { |
168 | noioapicquirk = 1; | 171 | noioapicquirk = 1; |
172 | noioapicreroute = -1; | ||
169 | skip_ioapic_setup = 1; | 173 | skip_ioapic_setup = 1; |
170 | } | 174 | } |
171 | 175 | ||
diff --git a/include/asm-x86/pci.h b/include/asm-x86/pci.h index 30eec93a845e..52a29f7668ef 100644 --- a/include/asm-x86/pci.h +++ b/include/asm-x86/pci.h | |||
@@ -20,6 +20,7 @@ struct pci_sysdata { | |||
20 | 20 | ||
21 | extern int pci_routeirq; | 21 | extern int pci_routeirq; |
22 | extern int noioapicquirk; | 22 | extern int noioapicquirk; |
23 | extern int ioapicreroute; | ||
23 | 24 | ||
24 | /* scan a bus after allocating a pci_sysdata for it */ | 25 | /* scan a bus after allocating a pci_sysdata for it */ |
25 | extern struct pci_bus *pci_scan_bus_on_node(int busno, struct pci_ops *ops, | 26 | extern struct pci_bus *pci_scan_bus_on_node(int busno, struct pci_ops *ops, |