Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / blackfin / mach-common / smp.c

diff --git a/arch/blackfin/mach-common/smp.c b/arch/blackfin/mach-common/smp.c
index 1c7259597395e587e3660b10ad4e5f1e6f8d0ba3..0030e21cfceb3b885e8365168ba91b74ddee4f75 100644 (file)
--- a/arch/blackfin/mach-common/smp.c
+++ b/arch/blackfin/mach-common/smp.c
@@ -195,7 +195,7 @@ void send_ipi(const struct cpumask *cpumask, enum ipi_message_type msg)
        local_irq_save(flags);
        for_each_cpu(cpu, cpumask) {
                bfin_ipi_data = &per_cpu(bfin_ipi, cpu);
-               atomic_set_mask((1 << msg), &bfin_ipi_data->bits);
+               atomic_or((1 << msg), &bfin_ipi_data->bits);
                atomic_inc(&bfin_ipi_data->count);
        }
        local_irq_restore(flags);