[PATCH] powerpc: Fix numa topology console print

[PATCH] powerpc: Fix numa topology console print

[Aneesh Kumar K.V]

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 using proper printk args

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
 arch/powerpc/mm/numa.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 75b9cd6150cc..c8fd54ec40e4 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -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");
 	}
 }
 
@@ -882,7 +882,7 @@ static void __init dump_numa_memory_topology(void)
 	for_each_online_node(node) {
 		unsigned long i;
 
-		printk(KERN_DEBUG "Node %d Memory:", node);
+		pr_info("Node %d Memory:", node);
 
 		count = 0;
 
@@ -890,18 +890,18 @@ static void __init dump_numa_memory_topology(void)
 		     i += (1 << SECTION_SIZE_BITS)) {
 			if (early_pfn_to_nid(i >> PAGE_SHIFT) == node) {
 				if (count == 0)
-					printk(" 0x%lx", i);
+					pr_cont(" 0x%lx", i);
 				++count;
 			} else {
 				if (count > 0)
-					printk("-0x%lx", i);
+					pr_cont("-0x%lx", i);
 				count = 0;
 			}
 		}
 
 		if (count > 0)
-			printk("-0x%lx", i);
-		printk("\n");
+			pr_cont("-0x%lx", i);
+		pr_cont("\n");
 	}
 }
 
-- 
2.10.1

Re: powerpc: Fix numa topology console print

[Michael Ellerman]

On Tue, 2016-18-10 at 08:52:14 UTC, "Aneesh Kumar K.V" wrote:
> 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 using proper printk args
> 
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>

Applied to powerpc fixes, thanks.

https://git.kernel.org/powerpc/c/8467801cc8744511bd2664fae7d72a

cheers