Commit-ID: 7046debf15b3d0454fac09175dba7272d07cbe31 Gitweb: http://git.kernel.org/tip/7046debf15b3d0454fac09175dba7272d07cbe31 Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx> AuthorDate: Tue, 2 Dec 2014 22:46:52 +0100 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitDate: Wed, 3 Dec 2014 00:37:08 +0100 x86, ioapic: Correct printout of ioapic entries commit 5c1eb3863d08 'x86, irq: Simplify the way to print IOAPIC entry' got the printout of mask and polarity wrong. !mask is enabled and !polarity is high. Turn it around. While at it make the printout aligned for the different texts so the output can be easily parsed. Fixes: 5c1eb3863d08 'x86, irq: Simplify the way to print IOAPIC entry' Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Jiang Liu <jiang.liu@xxxxxxxxxxxxxxx> Cc: x86@xxxxxxxxxx --- arch/x86/kernel/apic/io_apic.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index ec193bc..ff98c6b 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -1289,9 +1289,9 @@ static void io_apic_print_entries(unsigned int apic, unsigned int nr_entries) entry = ioapic_read_entry(apic, i); snprintf(buf, sizeof(buf), " pin%02x, %s, %s, %s, V(%02X), IRR(%1d), S(%1d)", - i, entry.mask ? "enabled" : "disabled", - entry.trigger ? "level" : "edge", - entry.polarity ? "high" : "low", + i, entry.mask ? "disabled" : "enabled ", + entry.trigger ? "level" : "edge ", + entry.polarity ? "low " : "high", entry.vector, entry.irr, entry.delivery_status); if (ir_entry->format) printk(KERN_DEBUG "%s, remapped, I(%04X), Z(%X)\n", @@ -1299,7 +1299,7 @@ static void io_apic_print_entries(unsigned int apic, unsigned int nr_entries) ir_entry->zero); else printk(KERN_DEBUG "%s, %s, D(%02X), M(%1d)\n", - buf, entry.dest_mode ? "logical" : "physical", + buf, entry.dest_mode ? "logical " : "physical", entry.dest, entry.delivery_mode); } } -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|