From b5a2d3f4e66a2c1559f7c4f4fdd25cbdc1fd1d14 Mon Sep 17 00:00:00 2001 From: Christian Ehrhardt Date: Tue, 13 Mar 2018 14:41:10 +0100 Subject: [PATCH] fix build on ppc64el Change-Id: I0fbc29c3f0e60e99b943bba9a20c45682918828e Signed-off-by: Christian Ehrhardt --- ...-for-a-compilation-error-with-else-clause.patch | 34 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 35 insertions(+) create mode 100644 debian/patches/dpdk-dev-eal-ppc-fix-rte_smp_mb-for-a-compilation-error-with-else-clause.patch diff --git a/debian/patches/dpdk-dev-eal-ppc-fix-rte_smp_mb-for-a-compilation-error-with-else-clause.patch b/debian/patches/dpdk-dev-eal-ppc-fix-rte_smp_mb-for-a-compilation-error-with-else-clause.patch new file mode 100644 index 00000000..5b974784 --- /dev/null +++ b/debian/patches/dpdk-dev-eal-ppc-fix-rte_smp_mb-for-a-compilation-error-with-else-clause.patch @@ -0,0 +1,34 @@ +From: Gowrishankar Muthukrishnan + +This patch fixes the compilation problem with rte_smp_mb, +when there is else clause following it, as in test_barrier.c. + +Fixes: 05c3fd7110 ("eal/ppc: atomic operations for IBM Power") +Cc: stable@dpdk.org + +Signed-off-by: Gowrishankar Muthukrishnan +Acked-by: Luca Boccassi +Acked-by: Chao Zhu + +--- + lib/librte_eal/common/include/arch/ppc_64/rte_atomic.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Forwarded: yes (http://dpdk.org/dev/patchwork/patch/35493/) +Author: Christian Ehrhardt +Original-Author: Gowrishankar Muthukrishnan +Origin: upstream, http://dpdk.org/dev/patchwork/patch/35493/ +Last-Update: 2018-03-13 +diff --git a/lib/librte_eal/common/include/arch/ppc_64/rte_atomic.h b/lib/librte_eal/common/include/arch/ppc_64/rte_atomic.h +index 39fce7b..1821774 100644 +--- a/lib/librte_eal/common/include/arch/ppc_64/rte_atomic.h ++++ b/lib/librte_eal/common/include/arch/ppc_64/rte_atomic.h +@@ -55,7 +55,7 @@ + * Guarantees that the LOAD and STORE operations generated before the + * barrier occur before the LOAD and STORE operations generated after. + */ +-#define rte_mb() {asm volatile("sync" : : : "memory"); } ++#define rte_mb() asm volatile("sync" : : : "memory") + + /** + * Write memory barrier. diff --git a/debian/patches/series b/debian/patches/series index 5722b395..f57c482c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ fix-vhost-user-socket-permission.patch +dpdk-dev-eal-ppc-fix-rte_smp_mb-for-a-compilation-error-with-else-clause.patch -- 2.16.6