Merge tag 'asm-generic-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd...

[sfrench/cifs-2.6.git] / drivers / hwtracing / coresight / coresight-etm4x.h

diff --git a/drivers/hwtracing/coresight/coresight-etm4x.h b/drivers/hwtracing/coresight/coresight-etm4x.h
index a7bfea31f7d8fa5ae08cf1791c1f8f742d2cdabb..4b21bb79f1682561d92c943cc84d27e77f7d79d5 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-etm4x.h
+++ b/drivers/hwtracing/coresight/coresight-etm4x.h
@@ -547,14 +547,14 @@
 #define etm4x_read32(csa, offset)                                      \
        ({                                                              \
                u32 __val = etm4x_relaxed_read32((csa), (offset));      \
-               __iormb(__val);                                         \
+               __io_ar(__val);                                         \
                __val;                                                  \
         })
 
 #define etm4x_read64(csa, offset)                                      \
        ({                                                              \
                u64 __val = etm4x_relaxed_read64((csa), (offset));      \
-               __iormb(__val);                                         \
+               __io_ar(__val);                                         \
                __val;                                                  \
         })
 
@@ -578,13 +578,13 @@
 
 #define etm4x_write32(csa, val, offset)                                        \
        do {                                                            \
-               __iowmb();                                              \
+               __io_bw();                                              \
                etm4x_relaxed_write32((csa), (val), (offset));          \
        } while (0)
 
 #define etm4x_write64(csa, val, offset)                                        \
        do {                                                            \
-               __iowmb();                                              \
+               __io_bw();                                              \
                etm4x_relaxed_write64((csa), (val), (offset));          \
        } while (0)