Condense the SRAT: messages to show all APIC id's for the
node on a single line.
Signed-off-by: Mike Travis <travis@xxxxxxx>
Reviewed-by: Jack Steiner <steiner@xxxxxxx>
Reviewed-by: Robin Holt <holt@xxxxxxx>
---
arch/x86/mm/srat_64.c | 16 ++++++++++++----
drivers/acpi/numa.c | 3 +++
2 files changed, 15 insertions(+), 4 deletions(-)
--- linux-2.6.32.orig/arch/x86/mm/srat_64.c
+++ linux-2.6.32/arch/x86/mm/srat_64.c
@@ -115,6 +115,7 @@ acpi_numa_x2apic_affinity_init(struct ac
{
int pxm, node;
int apic_id;
+ static int last_node = -1, last_pxm = -1;
if (srat_disabled())
return;
@@ -136,8 +137,16 @@ acpi_numa_x2apic_affinity_init(struct ac
apicid_to_node[apic_id] = node;
node_set(node, cpu_nodes_parsed);
acpi_numa = 1;
- printk(KERN_INFO "SRAT: PXM %u -> APIC %u -> Node %u\n",
- pxm, apic_id, node);
+ if (node != last_node) {
+ pr_info("SRAT: Node %u: PXM:APIC %u:%u",
+ node, pxm, apic_id);
+ last_node = node;
+ last_pxm = pxm;
+ } else if (pxm != last_pxm) {
+ pr_cont(" %u:%u", pxm, apic_id);
+ last_pxm = pxm;
+ } else
+ pr_cont(" :%u", apic_id);
}
/* Callback for Proximity Domain -> LAPIC mapping */
@@ -294,8 +303,7 @@ acpi_numa_memory_affinity_init(struct ac
nd->end = end;
}
- printk(KERN_INFO "SRAT: Node %u PXM %u %lx-%lx\n", node, pxm,
- start, end);
+ pr_info("SRAT: Node %u PXM %u %lx+%lx\n", node, pxm, start, end-start);
e820_register_active_regions(node, start >> PAGE_SHIFT,
end >> PAGE_SHIFT);
--- linux-2.6.32.orig/drivers/acpi/numa.c
+++ linux-2.6.32/drivers/acpi/numa.c
@@ -290,6 +290,9 @@ int __init acpi_numa_init(void)
if (!acpi_table_parse(ACPI_SIG_SRAT, acpi_parse_srat)) {
acpi_table_parse_srat(ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY,
acpi_parse_x2apic_affinity, NR_CPUS);
+ /* insure trailing newline is output */
+ pr_cont("\n");
+
acpi_table_parse_srat(ACPI_SRAT_TYPE_CPU_AFFINITY,
acpi_parse_processor_affinity, NR_CPUS);
acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY,
--
--
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
