From patchwork Fri Dec 8 10:00:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 121137 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp452018qgn; Fri, 8 Dec 2017 02:00:55 -0800 (PST) X-Google-Smtp-Source: AGs4zMa7kPc8gTiC2iDNYvcUqY4eJMMcZMeZbDbMWH06Hhy+2/d5O93bA8rbQT11guBEU/ek5qeY X-Received: by 10.55.70.77 with SMTP id t74mr34265766qka.342.1512727255242; Fri, 08 Dec 2017 02:00:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512727255; cv=none; d=google.com; s=arc-20160816; b=dDm2g1dz+2u7J74stzbc1gQIsZSrYIVunUlVltUneNHw7jjttOh4akbSn5uFDpfMPj kAKeptrF1aQ1mq+97Y9QYU7JxuRYYbmhDzRo2Y+KHfvoE4BhztjrRLIdEUo2w5iUscHt RZC/EAoZuXh0LkdziRBU8RCgUSg2XTfFXG9fEKQq9CleA+vbIfDNOHb4j0oSLqzf+cKy ug6Durouz+kGlC5C//ZKshEW/+YR3ZgwPTqgHcKbouQMQX2Zox3n2DpDjXv9dTErhXrj XQzBzKUtZ0Z68nrjIvqvA9fKBysU/xlduCVsJBjQxmQJpLWXQ47PuR46RUjICN8LYRc2 lFWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=AOy3/R2rQ6N//wlUPtRuuWMUUcWJDHLsrMcUSz1cY8g=; b=eTwDhgqXTf0wLiG0Cw2Wlps93Cpv/6qbJEJ5jkrDBq/kI1cOMxLHgLEa9XRMLX3MaT Z0/GRvKBDD92qPn4KWIx5hlhGC0RJA5Hb8B1RqmRCdvgI94D55FoPvar7Qfb++X7sY54 g+GhwL41N6VV1Jcui9ufSwCqyCLG1GCuzwnX8i10VbIhvDQV9Z08uUkM4CBvtxHcvd0q yjV9d7pv3JIUi+MmPf/cgEC0C/0sNOBFKA5HxXGyl0HMRsX16jXlyeekxpKPdUSrPH4q MtOiWh4gkTcHyODthuAMnvh4lIvmbMws0h+pY1tXcIEVv7qS9FdiaMFl5eIxQ82TAhlv QbGg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id w63si2568540qtd.470.2017.12.08.02.00.55; Fri, 08 Dec 2017 02:00:55 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id F043A60953; Fri, 8 Dec 2017 10:00:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id BFF0C60973; Fri, 8 Dec 2017 10:00:22 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 48D236095B; Fri, 8 Dec 2017 10:00:18 +0000 (UTC) Received: from forward103p.mail.yandex.net (forward103p.mail.yandex.net [77.88.28.106]) by lists.linaro.org (Postfix) with ESMTPS id 73AE360387 for ; Fri, 8 Dec 2017 10:00:11 +0000 (UTC) Received: from mxback9j.mail.yandex.net (mxback9j.mail.yandex.net [IPv6:2a02:6b8:0:1619::112]) by forward103p.mail.yandex.net (Yandex) with ESMTP id 401F82184261 for ; Fri, 8 Dec 2017 13:00:10 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback9j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id WB5GYw1kiE-0A3qoXV9; Fri, 08 Dec 2017 13:00:10 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id ZQTWdLZNRd-095W7sYQ; Fri, 08 Dec 2017 13:00:09 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Fri, 8 Dec 2017 13:00:08 +0300 Message-Id: <1512727208-7637-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512727208-7637-1-git-send-email-odpbot@yandex.ru> References: <1512727208-7637-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 330 Subject: [lng-odp] [PATCH API-NEXT v1 1/1] linux-gen: arm/aarch64 rename dmb to _odp_dmb X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Rename dmb() to _odp_dmb() to remove clash with DPDK-defined dmb(). Signed-off-by: Dmitry Eremin-Solenikov --- /** 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 --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)