From 38383890b21f995c3dafa177298d744e1db0be84 Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Thu, 31 Oct 2019 14:05:52 +0000 Subject: [PATCH] crypto/dpaa2_sec: fix build with clang 3.4.2 Building with clang 3.4.2 caused the following error: CC dpaa2_sec_dpseci.o In file included from /dpdk/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c:40: In file included from /dpdk/drivers/common/dpaax/caamflib/desc/ipsec.h:11: In file included from /dpdk/drivers/common/dpaax/caamflib/rta.h:11: In file included from .../common/dpaax/caamflib/rta/sec_run_time_asm.h:14: /dpdk/drivers/common/dpaax/compat.h:108:18: error: redefinition of typedef 'dma_addr_t' is a C11 feature [-Werror,-Wtypedef-redefinition] typedef uint64_t dma_addr_t; ^ /dpdk/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c:37:18: note: previous definition is here typedef uint64_t dma_addr_t; ^ The dma_addr_t was defined in the common compat.h file, and does not need to be redefined. The meson build include directories list was updated to enable the definition in the common compat.h file be used. Fixes: 8c83f28cc8a4 ("common/dpaax: move OF library from DPAA bus") Signed-off-by: Ciara Power Acked-by: Hemant Agrawal --- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 3 --- drivers/crypto/dpaa2_sec/meson.build | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index 52e522e4ab..add3b9ea65 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -33,9 +33,6 @@ #include "dpaa2_sec_event.h" #include "dpaa2_sec_logs.h" -/* Required types */ -typedef uint64_t dma_addr_t; - /* RTA header files */ #include #include diff --git a/drivers/crypto/dpaa2_sec/meson.build b/drivers/crypto/dpaa2_sec/meson.build index 1b749186ce..9d1b170be7 100644 --- a/drivers/crypto/dpaa2_sec/meson.build +++ b/drivers/crypto/dpaa2_sec/meson.build @@ -14,4 +14,4 @@ sources = files('dpaa2_sec_dpseci.c', allow_experimental_apis = true -includes += include_directories('mc', '../../common/dpaax/caamflib') +includes += include_directories('mc', '../../common/dpaax', '../../common/dpaax/caamflib') -- 2.20.1