Minimize X2APIC messages by printing 8 per line and dropping
the "enabled" flag since that's assumed. It will still print
"disabled" if necessary.
Signed-off-by: Mike Travis <travis@xxxxxxx>
Reviewed-by: Jack Steiner <steiner@xxxxxxx>
Reviewed-by: Robin Holt <holt@xxxxxxx>
---
arch/x86/kernel/acpi/boot.c | 3 +++
drivers/acpi/tables.c | 13 +++++++++----
2 files changed, 12 insertions(+), 4 deletions(-)
--- linux-2.6.32.orig/arch/x86/kernel/acpi/boot.c
+++ linux-2.6.32/arch/x86/kernel/acpi/boot.c
@@ -848,6 +848,9 @@ static int __init acpi_parse_madt_lapic_
if (!count) {
x2count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_X2APIC,
acpi_parse_x2apic, MAX_APICS);
+ /* insure trailing newline is output */
+ pr_cont("\n");
+
count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC,
acpi_parse_lapic, MAX_APICS);
}
--- linux-2.6.32.orig/drivers/acpi/tables.c
+++ linux-2.6.32/drivers/acpi/tables.c
@@ -66,11 +66,16 @@ 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",
+
+ if ((p->uid & 7) == 0)
+ pr_info(PREFIX "X2APIC apic_id=uid:");
+
+ pr_cont(" %02x=%02x%s%s",
p->local_apic_id, p->uid,
- (p->lapic_flags & ACPI_MADT_ENABLED) ?
- "enabled" : "disabled");
+ /* assume "enabled" unless "disabled" */
+ (p->lapic_flags & ACPI_MADT_ENABLED) ?
+ "" : " disabled",
+ (p->uid & 7) == 7 ? "\n" : "");
}
break;
--
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
