diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2011-04-22 15:02:36 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2011-04-22 15:02:36 +0000 |
| commit | eaa178b87b2f87320939c2458f912fb09cb4a496 (patch) | |
| tree | 580ec0b1eb1a5ed1f7d132c8a082f2bb3740632c /sys | |
| parent | 8618b052faf72be464af8a44d50a7a46aaea0fb2 (diff) | |
Stop printing the PCI interrupt line programmed by the BIOS for APIC
interrupts. It is irreleveant, confuses people and the information is
available in pcidump(8) output anyway.
ok oga@, jsg@, deraadt@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/pci/pci_machdep.c | 8 | ||||
| -rw-r--r-- | sys/arch/i386/pci/pci_machdep.c | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sys/arch/amd64/pci/pci_machdep.c b/sys/arch/amd64/pci/pci_machdep.c index f6a4bb449cd..8cf4464e96c 100644 --- a/sys/arch/amd64/pci/pci_machdep.c +++ b/sys/arch/amd64/pci/pci_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.c,v 1.42 2011/04/10 16:40:42 kettenis Exp $ */ +/* $OpenBSD: pci_machdep.c,v 1.43 2011/04/22 15:02:35 kettenis Exp $ */ /* $NetBSD: pci_machdep.c,v 1.3 2003/05/07 21:33:58 fvdl Exp $ */ /*- @@ -362,10 +362,8 @@ pci_intr_string(pci_chipset_tag_t pc, pci_intr_handle_t ih) #if NIOAPIC > 0 if (ih.line & APIC_INT_VIA_APIC) - snprintf(irqstr, sizeof(irqstr), "apic %d int %d (irq %d)", - APIC_IRQ_APIC(ih.line), - APIC_IRQ_PIN(ih.line), - pci_intr_line(pc, ih)); + snprintf(irqstr, sizeof(irqstr), "apic %d int %d", + APIC_IRQ_APIC(ih.line), APIC_IRQ_PIN(ih.line)); else snprintf(irqstr, sizeof(irqstr), "irq %d", pci_intr_line(pc, ih)); diff --git a/sys/arch/i386/pci/pci_machdep.c b/sys/arch/i386/pci/pci_machdep.c index e928858e394..74af57f3f86 100644 --- a/sys/arch/i386/pci/pci_machdep.c +++ b/sys/arch/i386/pci/pci_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.c,v 1.58 2011/01/10 16:26:27 kettenis Exp $ */ +/* $OpenBSD: pci_machdep.c,v 1.59 2011/04/22 15:02:35 kettenis Exp $ */ /* $NetBSD: pci_machdep.c,v 1.28 1997/06/06 23:29:17 thorpej Exp $ */ /*- @@ -609,8 +609,8 @@ pci_intr_string(pci_chipset_tag_t pc, pci_intr_handle_t ih) #if NIOAPIC > 0 if (ih.line & APIC_INT_VIA_APIC) { - snprintf(irqstr, sizeof irqstr, "apic %d int %d (irq %d)", - APIC_IRQ_APIC(ih.line), APIC_IRQ_PIN(ih.line), line); + snprintf(irqstr, sizeof irqstr, "apic %d int %d", + APIC_IRQ_APIC(ih.line), APIC_IRQ_PIN(ih.line)); return (irqstr); } #endif |