Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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.

+2 -1
+2 -1
arch/ia64/kernel/smpboot.c
··· 127 127 volatile int ia64_cpu_to_sapicid[NR_CPUS]; 128 128 EXPORT_SYMBOL(ia64_cpu_to_sapicid); 129 129 130 - static volatile cpumask_t cpu_callin_map; 130 + static cpumask_t cpu_callin_map; 131 131 132 132 struct smp_boot_data smp_boot_data __initdata; 133 133 ··· 477 477 for (timeout = 0; timeout < 100000; timeout++) { 478 478 if (cpumask_test_cpu(cpu, &cpu_callin_map)) 479 479 break; /* It has booted */ 480 + barrier(); /* Make sure we re-read cpu_callin_map */ 480 481 udelay(100); 481 482 } 482 483 Dprintk("\n");