cpumask: Use cpu_*_mask accessors code: alpha
PATCH 1/1 cpumask: Use cpu_*_mask accessors code: alpha
Impact: use new API, fix SMP bug.
Use the new accessors rather than frobbing bits directly.
This also removes the bug introduced in ee0c468b (alpha: compile fixes) which had Alpha setting bits on an on-stack cpumask, not the cpu_online_map.
(Trivial, but untested!)
Cc Ivan Kokshaysky <[email protected]>
Cc Richard Henderson <[email protected]>
Cc FUJITA Tomonori <[email protected]>
Signed-off-by Rusty Russell <[email protected]>
Signed-off-by Mike Travis <[email protected]>
--- arch/alpha/kernel/process.c | 8 ++++---- arch/alpha/kernel/smp.c | 11 ++++++----- 2 files changed, 10 insertions(+), 9 deletions(-)
arch/alpha/kernel/process.c +4 -4
@@ -93,8 +93,8 @@ common_shutdown_1(void *generic_ptr)if (cpuid != boot_cpuid) { flags |=0x00040000UL ;/* "remain halted" */ *pflags = flags; -cpu_clear (cpuid, cpu_present_map); -cpu_clear (cpuid, cpu_possible_map); +set_cpu_present (cpuid, false); +set_cpu_possible (cpuid, false);halt (); }#endif
@@ -120,8 +120,8 @@ common_shutdown_1(void *generic_ptr)#ifdef CONFIG_SMP /* Wait for the secondaries to halt. */ -cpu_clear (boot_cpuid, cpu_present_map); -cpu_clear (boot_cpuid, cpu_possible_map); +set_cpu_present (boot_cpuid, false); +set_cpu_possible (boot_cpuid, false);while (cpus_weight (cpu_present_map))barrier ();#endif
arch/alpha/kernel/smp.c +6 -6
@@ -120,12 +120,12 @@ smp_callin(void)smp_callin (void) {int cpuid =hard_smp_processor_id (); -cpumask_t mask = cpu_online_map; -if (cpu_test_and_set (cpuid, mask)) { +if (cpu_online (cpuid)) {printk ("??, cpu 0x%x already present??\n" , cpuid);BUG (); } +set_cpu_online (cpuid, true);/* Turn on machine checks. */ wrmces (7 );
@@ -436,8 +436,8 @@ setup_smp(void) ((char *)cpubase + i*hwrpb->processor_size);if ((cpu->flags &0x1cc ) ==0x1cc ) { smp_num_probed++; -cpu_set (i, cpu_possible_map); -cpu_set (i, cpu_present_map); +set_cpu_possible (i, true); +set_cpu_present (i, true); cpu->pal_revision = boot_cpu_palrev; }
@@ -470,8 +470,8 @@ smp_prepare_cpus(unsigned int max_cpus)/* Nothing to do on a UP box, or when told not to. */ if (smp_num_probed ==1 || max_cpus ==0 ) { - cpu_possible_map =cpumask_of_cpu (boot_cpuid); - cpu_present_map =cpumask_of_cpu (boot_cpuid); +init_cpu_possible (cpumask_of (boot_cpuid)); +init_cpu_present (cpumask_of (boot_cpuid));printk (KERN_INFO "SMP mode deactivated.\n" );return ; }
Quoted 3 lines · Rusty Russell
This also removes the bug introduced in
ee0c468b(alpha: compile fixes) which had Alpha setting bits on an on-stack cpumask, not thecpu_online_map.
Ouch. Shame on me.
Quoted 1 line
(Trivial, but untested!)
Compiles cleanly, thanks.
Acked-by Ivan Kokshaysky <[email protected]>
Ivan.