patch-2.4.27 linux-2.4.27/arch/i386/kernel/io_apic.c
Next file: linux-2.4.27/arch/i386/kernel/mpparse.c
Previous file: linux-2.4.27/arch/i386/kernel/i8259.c
Back to the patch index
Back to the overall index
- Lines: 42
- Date:
2004-08-07 16:26:04.550342504 -0700
- Orig file:
linux-2.4.26/arch/i386/kernel/io_apic.c
- Orig date:
2004-04-14 06:05:25.000000000 -0700
diff -urN linux-2.4.26/arch/i386/kernel/io_apic.c linux-2.4.27/arch/i386/kernel/io_apic.c
@@ -1691,18 +1691,10 @@
/*
*
- * IRQ's that are handled by the old PIC in all cases:
+ * IRQ's that are handled by the PIC in the MPS IOAPIC case.
* - IRQ2 is the cascade IRQ, and cannot be a io-apic IRQ.
* Linux doesn't really care, as it's not actually used
* for any interrupt handling anyway.
- * - There used to be IRQ13 here as well, but all
- * MPS-compliant must not use it for FPU coupling and we
- * want to use exception 16 anyway. And there are
- * systems who connect it to an I/O APIC for other uses.
- * Thus we don't mark it special any longer.
- *
- * Additionally, something is definitely wrong with irq9
- * on PIIX4 boards.
*/
#define PIC_IRQS (1<<2)
@@ -1710,7 +1702,11 @@
{
enable_IO_APIC();
- io_apic_irqs = ~PIC_IRQS;
+ if (acpi_ioapic)
+ io_apic_irqs = ~0; /* all IRQs go through IOAPIC */
+ else
+ io_apic_irqs = ~PIC_IRQS;
+
printk("ENABLING IO-APIC IRQs\n");
/*
@@ -1872,7 +1868,7 @@
entry.vector = assign_irq_vector(irq);
- printk(KERN_DEBUG "IOAPIC[%d]: Set PCI routing entry (%d-%d -> 0x%x -> "
+ Dprintk(KERN_DEBUG "IOAPIC[%d]: Set PCI routing entry (%d-%d -> 0x%x -> "
"IRQ %d Mode:%i Active:%i)\n", ioapic,
mp_ioapics[ioapic].mpc_apicid, pin, entry.vector, irq, edge_level, active_high_low);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)