diff options
author | Jayachandran C <jchandra@broadcom.com> | 2014-05-09 07:04:54 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2014-05-30 10:47:36 -0400 |
commit | 2e240ddd09d41645e928a19a3ff3290a0f546834 (patch) | |
tree | eed687d60560f1ebcfa01a7870bc76966421765f /arch/mips/netlogic/common/smp.c | |
parent | 9de10ffb54565b4d427adf1037579617e73cb8bf (diff) |
MIPS: Netlogic: Use cpumask_scnprintf for wakeup_mask
Use standard function to print cpumask. Also fixup a typo in the same
file.
Signed-off-by: Jayachandran C <jchandra@broadcom.com>
Cc: g@linux-mips.org
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/6909/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/netlogic/common/smp.c')
-rw-r--r-- | arch/mips/netlogic/common/smp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/mips/netlogic/common/smp.c b/arch/mips/netlogic/common/smp.c index d81b443188af..4fde7ac76cc9 100644 --- a/arch/mips/netlogic/common/smp.c +++ b/arch/mips/netlogic/common/smp.c | |||
@@ -194,7 +194,7 @@ void __init nlm_smp_setup(void) | |||
194 | cpumask_scnprintf(buf, ARRAY_SIZE(buf), cpu_possible_mask); | 194 | cpumask_scnprintf(buf, ARRAY_SIZE(buf), cpu_possible_mask); |
195 | pr_info("Possible CPU mask: %s\n", buf); | 195 | pr_info("Possible CPU mask: %s\n", buf); |
196 | 196 | ||
197 | /* check with the cores we have worken up */ | 197 | /* check with the cores we have woken up */ |
198 | for (ncore = 0, i = 0; i < NLM_NR_NODES; i++) | 198 | for (ncore = 0, i = 0; i < NLM_NR_NODES; i++) |
199 | ncore += hweight32(nlm_get_node(i)->coremask); | 199 | ncore += hweight32(nlm_get_node(i)->coremask); |
200 | 200 | ||
@@ -209,6 +209,7 @@ static int nlm_parse_cpumask(cpumask_t *wakeup_mask) | |||
209 | { | 209 | { |
210 | uint32_t core0_thr_mask, core_thr_mask; | 210 | uint32_t core0_thr_mask, core_thr_mask; |
211 | int threadmode, i, j; | 211 | int threadmode, i, j; |
212 | char buf[64]; | ||
212 | 213 | ||
213 | core0_thr_mask = 0; | 214 | core0_thr_mask = 0; |
214 | for (i = 0; i < NLM_THREADS_PER_CORE; i++) | 215 | for (i = 0; i < NLM_THREADS_PER_CORE; i++) |
@@ -243,8 +244,8 @@ static int nlm_parse_cpumask(cpumask_t *wakeup_mask) | |||
243 | return threadmode; | 244 | return threadmode; |
244 | 245 | ||
245 | unsupp: | 246 | unsupp: |
246 | panic("Unsupported CPU mask %lx", | 247 | cpumask_scnprintf(buf, ARRAY_SIZE(buf), wakeup_mask); |
247 | (unsigned long)cpumask_bits(wakeup_mask)[0]); | 248 | panic("Unsupported CPU mask %s", buf); |
248 | return 0; | 249 | return 0; |
249 | } | 250 | } |
250 | 251 | ||