diff options
author | Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> | 2016-10-18 04:52:14 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-10-19 05:35:41 -0400 |
commit | 8467801cc8744511bd2664fae7d72ab704816844 (patch) | |
tree | 8b37350c3401f68e526b7001caf9e15ecb5520f1 | |
parent | 08b5e79ebdb58868cbb6976ba0e3898029394e6d (diff) |
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>
-rw-r--r-- | arch/powerpc/mm/numa.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index db5fc2b54c5a..a51c188b81f3 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c | |||
@@ -845,7 +845,7 @@ void __init dump_numa_cpu_topology(void) | |||
845 | return; | 845 | return; |
846 | 846 | ||
847 | for_each_online_node(node) { | 847 | for_each_online_node(node) { |
848 | printk(KERN_DEBUG "Node %d CPUs:", node); | 848 | pr_info("Node %d CPUs:", node); |
849 | 849 | ||
850 | count = 0; | 850 | count = 0; |
851 | /* | 851 | /* |
@@ -856,18 +856,18 @@ void __init dump_numa_cpu_topology(void) | |||
856 | if (cpumask_test_cpu(cpu, | 856 | if (cpumask_test_cpu(cpu, |
857 | node_to_cpumask_map[node])) { | 857 | node_to_cpumask_map[node])) { |
858 | if (count == 0) | 858 | if (count == 0) |
859 | printk(" %u", cpu); | 859 | pr_cont(" %u", cpu); |
860 | ++count; | 860 | ++count; |
861 | } else { | 861 | } else { |
862 | if (count > 1) | 862 | if (count > 1) |
863 | printk("-%u", cpu - 1); | 863 | pr_cont("-%u", cpu - 1); |
864 | count = 0; | 864 | count = 0; |
865 | } | 865 | } |
866 | } | 866 | } |
867 | 867 | ||
868 | if (count > 1) | 868 | if (count > 1) |
869 | printk("-%u", nr_cpu_ids - 1); | 869 | pr_cont("-%u", nr_cpu_ids - 1); |
870 | printk("\n"); | 870 | pr_cont("\n"); |
871 | } | 871 | } |
872 | } | 872 | } |
873 | 873 | ||