summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-06-02 10:58:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-02 10:58:34 -0700
commit8cd9234c64c584432f6992fe944ca9e46ca8ea76 (patch)
tree9b2ef6326738e7121ce810859f149789f5df518a
parent161f873b89136eb1e69477c847d5a5033239d9ba (diff)
parent5eda7861e347ffe927ecde5abd74d7b13ae938fa (diff)
downloadlinux-8cd9234c64c584432f6992fe944ca9e46ca8ea76.tar.bz2
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.
-rw-r--r--arch/ia64/kernel/smpboot.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 15051e9c2c6f..b054c5c6e713 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -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");