aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/netlogic/xlp/setup.c
diff options
context:
space:
mode:
authorJayachandran C <jchandra@broadcom.com>2012-10-31 08:01:37 -0400
committerJohn Crispin <blogic@openwrt.org>2012-11-09 05:37:19 -0500
commit2a37b1ae443f20470a789b12a45cbc249c9e50a6 (patch)
tree101eacbdbc8a34ae7bcd0da8950972165f00d253 /arch/mips/netlogic/xlp/setup.c
parent7143246e9ace7f6b50aad217289dd64b7a44dd2c (diff)
MIPS: Netlogic: Move from u32 cpumask to cpumask_t
Initial code to support more than 32 cpus. The platform CPU mask is updated from 32-bit mask to cpumask_t. Convert places that use cpu_/cpus_ functions to use cpumask_* functions. Signed-off-by: Jayachandran C <jchandra@broadcom.com> Patchwork: http://patchwork.linux-mips.org/patch/4464 Signed-off-by: John Crispin <blogic@openwrt.org>
Diffstat (limited to 'arch/mips/netlogic/xlp/setup.c')
-rw-r--r--arch/mips/netlogic/xlp/setup.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/mips/netlogic/xlp/setup.c b/arch/mips/netlogic/xlp/setup.c
index b886a508f85a..9f8d360a246e 100644
--- a/arch/mips/netlogic/xlp/setup.c
+++ b/arch/mips/netlogic/xlp/setup.c
@@ -55,7 +55,8 @@
55unsigned long nlm_common_ebase = 0x0; 55unsigned long nlm_common_ebase = 0x0;
56 56
57/* default to uniprocessor */ 57/* default to uniprocessor */
58uint32_t nlm_coremask = 1, nlm_cpumask = 1; 58uint32_t nlm_coremask = 1;
59cpumask_t nlm_cpumask = CPU_MASK_CPU0;
59int nlm_threads_per_core = 1; 60int nlm_threads_per_core = 1;
60extern u32 __dtb_start[]; 61extern u32 __dtb_start[];
61 62
@@ -115,7 +116,8 @@ void __init prom_init(void)
115 nlm_common_ebase = read_c0_ebase() & (~((1 << 12) - 1)); 116 nlm_common_ebase = read_c0_ebase() & (~((1 << 12) - 1));
116 117
117#ifdef CONFIG_SMP 118#ifdef CONFIG_SMP
118 nlm_wakeup_secondary_cpus(0xffffffff); 119 cpumask_setall(&nlm_cpumask);
120 nlm_wakeup_secondary_cpus();
119 121
120 /* update TLB size after waking up threads */ 122 /* update TLB size after waking up threads */
121 current_cpu_data.tlbsize = ((read_c0_config6() >> 16) & 0xffff) + 1; 123 current_cpu_data.tlbsize = ((read_c0_config6() >> 16) & 0xffff) + 1;