ia64: make cpu_callin_map non-volatile.
cpumask_test_cpu() doesn't take volatile, unlike the obsoleted cpu_isset. The only place ia64 really cares is the spin waiting for a bit; udelay() is probably a barrier but insert rmb() to be sure.
Signed-off-by Rusty Russell <[email protected]>
arch/ia64/kernel/smpboot.c +2 -1
@@ -127,7 +127,7 @@ int smp_num_siblings = 1;volatile int ia64_cpu_to_sapicid[NR_CPUS ];EXPORT_SYMBOL (ia64_cpu_to_sapicid); -static volatile cpumask_t cpu_callin_map; +static cpumask_t cpu_callin_map;struct smp_boot_data smp_boot_data__initdata ;
@@ -477,6 +477,7 @@ do_boot_cpu (int sapicid, int cpu, struct task_struct *idle)for (timeout =0 ; timeout <100000 ; timeout++) {if (cpumask_test_cpu (cpu, &cpu_callin_map))break ;/* It has booted */ +rmb ();/* Make sure we re-read cpu_callin_map */ udelay (100 ); }Dprintk ("\n" );