Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5eda7861 authored by Rusty Russell's avatar Rusty Russell Committed by Tony Luck
Browse files

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 barrier() to be sure.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent c65b99f0

arch/ia64/kernel/smpboot.c

+2 −1
Original line number Diff line number Diff line
@@ -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 */

		barrier(); /* Make sure we re-read cpu_callin_map */

		udelay(100);

	}

	Dprintk("\n");