summaryrefslogtreecommitdiffstats
path: root/arch/blackfin/mach-common/smp.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-09 16:10:14 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-09 16:10:14 +0900
commitdea77ccdc93448d81e495a57bc1c1e97be4fdfe8 (patch)
treea8b0ed4c01332efa9a00b9a810fa4a00b74e5630 /arch/blackfin/mach-common/smp.c
parentde390bba797aa9a554bc1769b6a8771605854d79 (diff)
parent6594b982f6d5f957c8d72de7658bf8e240c7dfca (diff)
downloadop-kernel-dev-dea77ccdc93448d81e495a57bc1c1e97be4fdfe8.zip
op-kernel-dev-dea77ccdc93448d81e495a57bc1c1e97be4fdfe8.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin
Pull blackfin update from Bob Liu. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin: Blackfin: smp: add smp_mb() to keep coherency Blackfin: drop irq enable in init_arch_irq() Blackfin: fix wrong place disabled irq Blackfin: update defconfig for bf609-ezkit Blackfin: add bf548 v0.4 revision Blackfin: bf60x: Add bf608 and bf609 specific perpheral MMRs Blackfin: cpufreq: fix dpm_state_table Blackfin: bfin_gpio: proc: fix return value Blackfin: CM-BF537E: Update SPORT support in board file. Blackfin: bf537: fix lq035 platform device name Blackfin: bf533-ezkit: enable flash drivers by default
Diffstat (limited to 'arch/blackfin/mach-common/smp.c')
-rw-r--r--arch/blackfin/mach-common/smp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/mach-common/smp.c b/arch/blackfin/mach-common/smp.c
index a401513..bb61ae4 100644
--- a/arch/blackfin/mach-common/smp.c
+++ b/arch/blackfin/mach-common/smp.c
@@ -146,7 +146,7 @@ static irqreturn_t ipi_handler_int1(int irq, void *dev_instance)
platform_clear_ipi(cpu, IRQ_SUPPLE_1);
bfin_ipi_data = &__get_cpu_var(bfin_ipi);
-
+ smp_mb();
while ((pending = xchg(&bfin_ipi_data->bits, 0)) != 0) {
msg = 0;
do {
@@ -195,7 +195,7 @@ void send_ipi(const struct cpumask *cpumask, enum ipi_message_type msg)
unsigned long flags;
local_irq_save(flags);
-
+ smp_mb();
for_each_cpu(cpu, cpumask) {
bfin_ipi_data = &per_cpu(bfin_ipi, cpu);
smp_mb();
OpenPOWER on IntegriCloud