diff mbox series

[API-NEXT,v1,1/1] linux-gen: arm/aarch64 rename dmb to _odp_dmb

Message ID 1512727208-7637-2-git-send-email-odpbot@yandex.ru
State New
Headers show
Series [API-NEXT,v1,1/1] linux-gen: arm/aarch64 rename dmb to _odp_dmb | expand

Commit Message

Github ODP bot Dec. 8, 2017, 10 a.m. UTC 
From: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


Rename dmb() to _odp_dmb() to remove clash with DPDK-defined dmb().

Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>

---
/** Email created from pull request 330 (lumag:dmb)
 ** https://github.com/Linaro/odp/pull/330
 ** Patch: https://github.com/Linaro/odp/pull/330.patch
 ** Base sha: 0980001e33b4190133d478a0aa2e718fd1e3c164
 ** Merge commit sha: 708e3bc3d29dfe8c56d6dc13dbce44b73ea33231
 **/
 platform/linux-generic/arch/aarch64/odp_cpu.h |  2 +-
 platform/linux-generic/arch/arm/odp_cpu.h     |  2 +-
 platform/linux-generic/arch/arm/odp_llsc.h    | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/platform/linux-generic/arch/aarch64/odp_cpu.h b/platform/linux-generic/arch/aarch64/odp_cpu.h
index fc35a4625..170f23d8d 100644
--- a/platform/linux-generic/arch/aarch64/odp_cpu.h
+++ b/platform/linux-generic/arch/aarch64/odp_cpu.h
@@ -40,7 +40,7 @@ 
  */
 #define CONFIG_WFE
 
-static inline void dmb(void)
+static inline void _odp_dmb(void)
 {
 	__asm__ volatile("dmb" : : : "memory");
 }
diff --git a/platform/linux-generic/arch/arm/odp_cpu.h b/platform/linux-generic/arch/arm/odp_cpu.h
index d77c85215..4e8acc7f7 100644
--- a/platform/linux-generic/arch/arm/odp_cpu.h
+++ b/platform/linux-generic/arch/arm/odp_cpu.h
@@ -40,7 +40,7 @@ 
  */
 /* #define CONFIG_WFE */
 
-static inline void dmb(void)
+static inline void _odp_dmb(void)
 {
 	__asm__ volatile("dmb" : : : "memory");
 }
diff --git a/platform/linux-generic/arch/arm/odp_llsc.h b/platform/linux-generic/arch/arm/odp_llsc.h
index b53cedc2e..fd12c63c8 100644
--- a/platform/linux-generic/arch/arm/odp_llsc.h
+++ b/platform/linux-generic/arch/arm/odp_llsc.h
@@ -23,7 +23,7 @@  static inline uint32_t ll8(uint8_t *var, int mm)
 			 : );
 	/* Barrier after an acquiring load */
 	if (mm == __ATOMIC_ACQUIRE)
-		dmb();
+		_odp_dmb();
 	return old;
 }
 
@@ -37,7 +37,7 @@  static inline uint32_t ll(uint32_t *var, int mm)
 			 : );
 	/* Barrier after an acquiring load */
 	if (mm == __ATOMIC_ACQUIRE)
-		dmb();
+		_odp_dmb();
 	return old;
 }
 
@@ -50,7 +50,7 @@  static inline uint32_t sc(uint32_t *var, uint32_t neu, int mm)
 
 	/* Barrier before a releasing store */
 	if (mm == __ATOMIC_RELEASE)
-		dmb();
+		_odp_dmb();
 	__asm__ volatile("strex %0, %1, [%2]"
 			 : "=&r" (ret)
 			 : "r" (neu), "r" (var)
@@ -70,7 +70,7 @@  static inline uint64_t lld(uint64_t *var, int mm)
 			 : );
 	/* Barrier after an acquiring load */
 	if (mm == __ATOMIC_ACQUIRE)
-		dmb();
+		_odp_dmb();
 	return old;
 }
 
@@ -83,7 +83,7 @@  static inline uint32_t scd(uint64_t *var, uint64_t neu, int mm)
 
 	/* Barrier before a releasing store */
 	if (mm == __ATOMIC_RELEASE)
-		dmb();
+		_odp_dmb();
 	__asm__ volatile("strexd %0, %1, %H1, [%2]"
 			 : "=&r" (ret)
 			 : "r" (neu), "r" (var)