Merge branch 'linus' into locking/core, to resolve conflicts

[linux-block.git] / arch / arc / kernel / smp.c

diff --git a/arch/arc/kernel/smp.c b/arch/arc/kernel/smp.c
index 6df9d94a953763eca43b20f02f1897308ab1ee7a..efe8b4200a676529a9f3f0af52d50faca176a1e3 100644 (file)
--- a/arch/arc/kernel/smp.c
+++ b/arch/arc/kernel/smp.c
@@ -250,7 +250,7 @@ static void ipi_send_msg_one(int cpu, enum ipi_msg_type msg)
         * and read back old value
         */
        do {
-               new = old = ACCESS_ONCE(*ipi_data_ptr);
+               new = old = READ_ONCE(*ipi_data_ptr);
                new |= 1U << msg;
        } while (cmpxchg(ipi_data_ptr, old, new) != old);