Minimize X2APIC messages by printing 8 per line and dropping the "enabled" flag since that's assumed. It will still print "disabled" if necessary. v2: updated to apply to x86-tip Signed-off-by: Mike Travis Reviewed-by: Jack Steiner Reviewed-by: Robin Holt --- arch/x86/kernel/acpi/boot.c | 3 +++ drivers/acpi/tables.c | 16 +++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) --- linux.orig/arch/x86/kernel/acpi/boot.c +++ linux/arch/x86/kernel/acpi/boot.c @@ -903,6 +903,9 @@ static int __init acpi_parse_madt_lapic_ if (!count) { x2count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_X2APIC, acpi_parse_x2apic, MAX_LOCAL_APIC); + /* insure trailing newline is output */ + pr_cont("\n"); + count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC, acpi_parse_lapic, MAX_LOCAL_APIC); } --- linux.orig/drivers/acpi/tables.c +++ linux/drivers/acpi/tables.c @@ -66,11 +66,17 @@ void acpi_table_print_madt_entry(struct { struct acpi_madt_local_x2apic *p = (struct acpi_madt_local_x2apic *)header; - printk(KERN_INFO PREFIX - "X2APIC (apic_id[0x%02x] uid[0x%02x] %s)\n", - p->local_apic_id, p->uid, - (p->lapic_flags & ACPI_MADT_ENABLED) ? - "enabled" : "disabled"); + + if ((p->uid & 7) == 0) + pr_info(PREFIX "X2APIC apic_id=uid:"); + + pr_cont(" %02x=%02x%s%s", + p->local_apic_id, p->uid, + /* assume "enabled" unless "disabled" */ + (p->lapic_flags & ACPI_MADT_ENABLED) ? + "" : " disabled", + /* nl every 8th item */ + (p->uid & 7) == 7 ? "\n" : ""); } break; -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/