git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
include
/
asm-x86_64
/
io_apic.h
diff --git
a/include/asm-x86_64/io_apic.h
b/include/asm-x86_64/io_apic.h
index
2882961
..
7efc932
100644
(file)
--- a/
include/asm-x86_64/io_apic.h
+++ b/
include/asm-x86_64/io_apic.h
@@
-199,7
+199,7
@@
extern int skip_ioapic_setup;
* If we use the IO-APIC for IRQ routing, disable automatic
* assignment of PCI IRQ's.
*/
* If we use the IO-APIC for IRQ routing, disable automatic
* assignment of PCI IRQ's.
*/
-#define io_apic_assign_pci_irqs (mp_irq_entries && !skip_ioapic_setup)
+#define io_apic_assign_pci_irqs (mp_irq_entries && !skip_ioapic_setup
&& io_apic_irqs
)
#ifdef CONFIG_ACPI_BOOT
extern int io_apic_get_unique_id (int ioapic, int apic_id);
#ifdef CONFIG_ACPI_BOOT
extern int io_apic_get_unique_id (int ioapic, int apic_id);