diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2009-09-24 11:34:47 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2009-09-23 20:04:48 -0400 |
commit | 4037ac6e2cb4e3148c25124b431eead4e704a4ff (patch) | |
tree | d903d818bd2484a57e081b4afdeb38aadaa2beb1 | |
parent | 2377afdde16a50b72e0b7ddb96d6b905f73754e2 (diff) |
cpumask: Use accessors for cpu_*_mask: mips
Use the accessors rather than frobbing bits directly (the new versions
are const).
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Mike Travis <travis@sgi.com>
-rw-r--r-- | arch/mips/kernel/smp-cmp.c | 2 | ||||
-rw-r--r-- | arch/mips/kernel/smp-mt.c | 2 | ||||
-rw-r--r-- | arch/mips/kernel/smp.c | 6 | ||||
-rw-r--r-- | arch/mips/kernel/smtc.c | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/arch/mips/kernel/smp-cmp.c b/arch/mips/kernel/smp-cmp.c index e5cf5b88fc28..cc81771b882c 100644 --- a/arch/mips/kernel/smp-cmp.c +++ b/arch/mips/kernel/smp-cmp.c | |||
@@ -171,7 +171,7 @@ void __init cmp_smp_setup(void) | |||
171 | 171 | ||
172 | for (i = 1; i < NR_CPUS; i++) { | 172 | for (i = 1; i < NR_CPUS; i++) { |
173 | if (amon_cpu_avail(i)) { | 173 | if (amon_cpu_avail(i)) { |
174 | cpu_set(i, cpu_possible_map); | 174 | set_cpu_possible(i, true); |
175 | __cpu_number_map[i] = ++ncpu; | 175 | __cpu_number_map[i] = ++ncpu; |
176 | __cpu_logical_map[ncpu] = i; | 176 | __cpu_logical_map[ncpu] = i; |
177 | } | 177 | } |
diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c index 9538ca42e008..43e7cdc5ded2 100644 --- a/arch/mips/kernel/smp-mt.c +++ b/arch/mips/kernel/smp-mt.c | |||
@@ -70,7 +70,7 @@ static unsigned int __init smvp_vpe_init(unsigned int tc, unsigned int mvpconf0, | |||
70 | write_vpe_c0_vpeconf0(tmp); | 70 | write_vpe_c0_vpeconf0(tmp); |
71 | 71 | ||
72 | /* Record this as available CPU */ | 72 | /* Record this as available CPU */ |
73 | cpu_set(tc, cpu_possible_map); | 73 | set_cpu_possible(tc, true); |
74 | __cpu_number_map[tc] = ++ncpu; | 74 | __cpu_number_map[tc] = ++ncpu; |
75 | __cpu_logical_map[ncpu] = tc; | 75 | __cpu_logical_map[ncpu] = tc; |
76 | } | 76 | } |
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c index df2ace9558b9..4eb106c6a3ec 100644 --- a/arch/mips/kernel/smp.c +++ b/arch/mips/kernel/smp.c | |||
@@ -183,15 +183,15 @@ void __init smp_prepare_cpus(unsigned int max_cpus) | |||
183 | mp_ops->prepare_cpus(max_cpus); | 183 | mp_ops->prepare_cpus(max_cpus); |
184 | set_cpu_sibling_map(0); | 184 | set_cpu_sibling_map(0); |
185 | #ifndef CONFIG_HOTPLUG_CPU | 185 | #ifndef CONFIG_HOTPLUG_CPU |
186 | cpu_present_map = cpu_possible_map; | 186 | init_cpu_present(&cpu_possible_map); |
187 | #endif | 187 | #endif |
188 | } | 188 | } |
189 | 189 | ||
190 | /* preload SMP state for boot cpu */ | 190 | /* preload SMP state for boot cpu */ |
191 | void __devinit smp_prepare_boot_cpu(void) | 191 | void __devinit smp_prepare_boot_cpu(void) |
192 | { | 192 | { |
193 | cpu_set(0, cpu_possible_map); | 193 | set_cpu_possible(0, true); |
194 | cpu_set(0, cpu_online_map); | 194 | set_cpu_online(0, true); |
195 | cpu_set(0, cpu_callin_map); | 195 | cpu_set(0, cpu_callin_map); |
196 | } | 196 | } |
197 | 197 | ||
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c index 1a466baf0edf..67153a0dc267 100644 --- a/arch/mips/kernel/smtc.c +++ b/arch/mips/kernel/smtc.c | |||
@@ -305,7 +305,7 @@ int __init smtc_build_cpu_map(int start_cpu_slot) | |||
305 | */ | 305 | */ |
306 | ntcs = ((read_c0_mvpconf0() & MVPCONF0_PTC) >> MVPCONF0_PTC_SHIFT) + 1; | 306 | ntcs = ((read_c0_mvpconf0() & MVPCONF0_PTC) >> MVPCONF0_PTC_SHIFT) + 1; |
307 | for (i=start_cpu_slot; i<NR_CPUS && i<ntcs; i++) { | 307 | for (i=start_cpu_slot; i<NR_CPUS && i<ntcs; i++) { |
308 | cpu_set(i, cpu_possible_map); | 308 | set_cpu_possible(i, true); |
309 | __cpu_number_map[i] = i; | 309 | __cpu_number_map[i] = i; |
310 | __cpu_logical_map[i] = i; | 310 | __cpu_logical_map[i] = i; |
311 | } | 311 | } |
@@ -525,8 +525,8 @@ void smtc_prepare_cpus(int cpus) | |||
525 | * Pull any physically present but unused TCs out of circulation. | 525 | * Pull any physically present but unused TCs out of circulation. |
526 | */ | 526 | */ |
527 | while (tc < (((val & MVPCONF0_PTC) >> MVPCONF0_PTC_SHIFT) + 1)) { | 527 | while (tc < (((val & MVPCONF0_PTC) >> MVPCONF0_PTC_SHIFT) + 1)) { |
528 | cpu_clear(tc, cpu_possible_map); | 528 | set_cpu_possible(tc, false); |
529 | cpu_clear(tc, cpu_present_map); | 529 | set_cpu_present(tc, false); |
530 | tc++; | 530 | tc++; |
531 | } | 531 | } |
532 | 532 | ||