diff options
| author |   Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2018-03-13 14:41:10 +0100 |
|---|---|---|
| committer | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2018-03-13 14:41:10 +0100 |
| commit | b5a2d3f4e66a2c1559f7c4f4fdd25cbdc1fd1d14 (patch) | |
| tree | 845bfd150d357ec04f97c4496751b25471149250 | |
| parent | 6749de318898e9b3c06bcbbac5e7be7f13e4ce36 (diff) | |
fix build on ppc64el
Change-Id: I0fbc29c3f0e60e99b943bba9a20c45682918828e
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
| -rw-r--r-- | debian/patches/dpdk-dev-eal-ppc-fix-rte_smp_mb-for-a-compilation-error-with-else-clause.patch | 34 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 35 insertions, 0 deletions
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 <gowrishankar.m@linux.vnet.ibm.com> + +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 <gowrishankar.m@linux.vnet.ibm.com> +Acked-by: Luca Boccassi <bluca@debian.org> +Acked-by: Chao Zhu <chaozhu@linux.vnet.ibm.com> + +--- + 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 <christian.ehrhardt@canonical.com> +Original-Author: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> +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 |