[dpdk-dev] [PATCH v6 06/17] drivers: fix header includes for musl
From: Thomas Monjalon <hidden>
Date: 2021-02-28 12:54:57
Subsystem:
the rest · Maintainer:
Linus Torvalds
The header files argp.h and error.h do not exist in musl libc
and are not needed in dpaa code.
The header file fcntl.h should not be included from sys/ directory
as done in dlb drivers, it is an error with musl libc.
Fixes: 5b22cf744689 ("bus/dpaa: introducing FMan configurations")
Fixes: 39f373cf015a ("bus/dpaa: add compatibility and helper macros")
Fixes: 19980083fd57 ("event/dlb: add eventdev probe")
Fixes: 5433956d5185 ("event/dlb2: add eventdev probe")
Cc: stable@dpdk.org
Signed-off-by: Thomas Monjalon <redacted>
---
drivers/bus/dpaa/include/netcfg.h | 1 -
drivers/common/dpaax/compat.h | 1 -
drivers/event/dlb/dlb.c | 2 +-
drivers/event/dlb/pf/dlb_pf.c | 3 ++-
drivers/event/dlb2/dlb2.c | 2 +-
drivers/event/dlb2/pf/dlb2_pf.c | 3 ++-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/bus/dpaa/include/netcfg.h b/drivers/bus/dpaa/include/netcfg.h
index d7d1befd24..bb18a34e3d 100644
--- a/drivers/bus/dpaa/include/netcfg.h
+++ b/drivers/bus/dpaa/include/netcfg.h@@ -9,7 +9,6 @@ #define __NETCFG_H #include <fman.h> -#include <argp.h> /* Configuration information related to a specific ethernet port */ struct fm_eth_port_cfg {
diff --git a/drivers/common/dpaax/compat.h b/drivers/common/dpaax/compat.h
index c69e76ab96..7166f8cceb 100644
--- a/drivers/common/dpaax/compat.h
+++ b/drivers/common/dpaax/compat.h@@ -30,7 +30,6 @@ #include <assert.h> #include <dirent.h> #include <inttypes.h> -#include <error.h> #include <rte_byteorder.h> #include <rte_atomic.h> #include <rte_spinlock.h>
diff --git a/drivers/event/dlb/dlb.c b/drivers/event/dlb/dlb.c
index 8b26d1d2d2..2fbfc6aed4 100644
--- a/drivers/event/dlb/dlb.c
+++ b/drivers/event/dlb/dlb.c@@ -10,7 +10,7 @@ #include <stdint.h> #include <stdio.h> #include <string.h> -#include <sys/fcntl.h> +#include <fcntl.h> #include <sys/mman.h> #include <unistd.h>
diff --git a/drivers/event/dlb/pf/dlb_pf.c b/drivers/event/dlb/pf/dlb_pf.c
index 3aeef6f91d..876c68e51d 100644
--- a/drivers/event/dlb/pf/dlb_pf.c
+++ b/drivers/event/dlb/pf/dlb_pf.c@@ -6,12 +6,13 @@ #include <stdbool.h> #include <stdio.h> #include <sys/mman.h> -#include <sys/fcntl.h> +#include <fcntl.h> #include <sys/time.h> #include <errno.h> #include <assert.h> #include <unistd.h> #include <string.h> + #include <rte_debug.h> #include <rte_log.h> #include <rte_dev.h>
diff --git a/drivers/event/dlb2/dlb2.c b/drivers/event/dlb2/dlb2.c
index b28ec58bfb..fb5ff012a4 100644
--- a/drivers/event/dlb2/dlb2.c
+++ b/drivers/event/dlb2/dlb2.c@@ -11,7 +11,7 @@ #include <stdio.h> #include <string.h> #include <sys/mman.h> -#include <sys/fcntl.h> +#include <fcntl.h> #include <rte_common.h> #include <rte_config.h>
diff --git a/drivers/event/dlb2/pf/dlb2_pf.c b/drivers/event/dlb2/pf/dlb2_pf.c
index 1a7d8fc294..b85fd3ec56 100644
--- a/drivers/event/dlb2/pf/dlb2_pf.c
+++ b/drivers/event/dlb2/pf/dlb2_pf.c@@ -6,12 +6,13 @@ #include <stdbool.h> #include <stdio.h> #include <sys/mman.h> -#include <sys/fcntl.h> +#include <fcntl.h> #include <sys/time.h> #include <errno.h> #include <assert.h> #include <unistd.h> #include <string.h> + #include <rte_debug.h> #include <rte_log.h> #include <rte_dev.h>
--
2.30.1