Commit 8467801c authored Oct 18, 2016 by Aneesh Kumar K.V Committed by Michael Ellerman Oct 19, 2016

powerpc: Fix numa topology console print



With recent update to printk, we get console output like below:

[    0.550639] Brought up 160 CPUs
[    0.550718] Node 0 CPUs:
[    0.550721]  0
[    0.550754] -39

[    0.550794] Node 1 CPUs:
[    0.550798]  40
[    0.550817] -79

[    0.550856] Node 16 CPUs:
[    0.550860]  80
[    0.550880] -119

[    0.550917] Node 17 CPUs:
[    0.550923]  120
[    0.550942] -159

Fix this by properly using pr_cont(), ie. KERN_CONT.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

parent 08b5e79e

arch/powerpc/mm/numa.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -845,7 +845,7 @@ void __init dump_numa_cpu_topology(void)
		return;

		for_each_online_node(node) {
		printk(KERN_DEBUG "Node %d CPUs:", node);
		pr_info("Node %d CPUs:", node);

		count = 0;
		/*
		@@ -856,18 +856,18 @@ void __init dump_numa_cpu_topology(void)
		if (cpumask_test_cpu(cpu,
		node_to_cpumask_map[node])) {
		if (count == 0)
		printk(" %u", cpu);
		pr_cont(" %u", cpu);
		++count;
		} else {
		if (count > 1)
		printk("-%u", cpu - 1);
		pr_cont("-%u", cpu - 1);
		count = 0;
		}
		}

		if (count > 1)
		printk("-%u", nr_cpu_ids - 1);
		printk("\n");
		pr_cont("-%u", nr_cpu_ids - 1);
		pr_cont("\n");
		}
		}

Admin message