diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2015-06-01 15:53:53 +0930 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2015-06-02 10:07:03 -0700 |
| commit | 5eda7861e347ffe927ecde5abd74d7b13ae938fa (patch) | |
| tree | cd5018b6c1b4a2ccf584faaa2f74e642d973a28b /arch/ia64 | |
| parent | c65b99f046843d2455aa231747b5a07a999a9f3d (diff) | |
| download | linux-stable-5eda7861e347ffe927ecde5abd74d7b13ae938fa.tar.gz linux-stable-5eda7861e347ffe927ecde5abd74d7b13ae938fa.tar.bz2 linux-stable-5eda7861e347ffe927ecde5abd74d7b13ae938fa.zip | |
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: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/kernel/smpboot.c | 3 |
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"); |