This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".

The branch, api-next has been updated via 630d8422564ebf4991b468cb38a29e9483fc2ec2 (commit) from ec42b01dc4f9992d0efef95d7f55399bba115f90 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 630d8422564ebf4991b468cb38a29e9483fc2ec2 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sat Dec 2 04:51:24 2017 +0300

linux-gen: arm/aarch64 rename dmb to _odp_dmb

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

Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org

diff --git a/platform/linux-generic/arch/aarch64/odp_cpu.h b/platform/linux-generic/arch/aarch64/odp_cpu.h index fc35a462..170f23d8 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 d77c8521..4e8acc7f 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 b53cedc2..fd12c63c 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)

-----------------------------------------------------------------------

Summary of changes: 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(-)

hooks/post-receive