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

Commit 8cd9234c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'please-pull-rusty' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux 

Pull ia64 fix from Tony Luck:
 "Fix some build warnings for ia64 - cpu_callin_map doesn't need to be
  volatile"

* tag 'please-pull-rusty' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  ia64: make cpu_callin_map non-volatile.
parents 161f873b 5eda7861

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");