net/ice: fix GTPU down/uplink and extension conflict

[dpdk.git] / drivers / bus / fslmc / mc / fsl_mc_sys.h

diff --git a/drivers/bus/fslmc/mc/fsl_mc_sys.h b/drivers/bus/fslmc/mc/fsl_mc_sys.h
index a48da10..a310c56 100644 (file)
--- a/drivers/bus/fslmc/mc/fsl_mc_sys.h
+++ b/drivers/bus/fslmc/mc/fsl_mc_sys.h
@@ -27,17 +27,15 @@ struct fsl_mc_io {
 #else /* __linux_driver__ */
 
 #include <stdio.h>
-#include <libio.h>
 #include <stdint.h>
 #include <errno.h>
 #include <sys/uio.h>
 #include <linux/byteorder/little_endian.h>
 
-#ifndef dmb
-#define dmb() {__asm__ __volatile__("" : : : "memory"); }
-#endif
-#define __iormb()      dmb()
-#define __iowmb()      dmb()
+#include <rte_atomic.h>
+
+#define __iormb()      rte_io_rmb()
+#define __iowmb()      rte_io_wmb()
 #define __arch_getq(a)         (*(volatile uint64_t *)(a))
 #define __arch_putq(v, a)      (*(volatile uint64_t *)(a) = (v))
 #define __arch_putq32(v, a)    (*(volatile uint32_t *)(a) = (v))