From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 9BD4CA034F;
Thu, 25 Feb 2021 19:24:02 +0100 (CET)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 63DFB160858;
Thu, 25 Feb 2021 19:23:35 +0100 (CET)
Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com
[66.111.4.26]) by mails.dpdk.org (Postfix) with ESMTP id D1EB016084E;
Thu, 25 Feb 2021 19:23:33 +0100 (CET)
Received: from compute2.internal (compute2.nyi.internal [10.202.2.42])
by mailout.nyi.internal (Postfix) with ESMTP id 74DEA5C0120;
Thu, 25 Feb 2021 13:23:33 -0500 (EST)
Received: from mailfrontend1 ([10.202.2.162])
by compute2.internal (MEProxy); Thu, 25 Feb 2021 13:23:33 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h=
from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding; s=fm3; bh=E0rcPQHIg33RF
HPXZv9oLgv14gAKtY+2Hr+YilEpXxM=; b=DprlbW2pCG6m8eh9l0RDpgyKcTgcm
r7JpToKYVvm5t0GCjkurRRDiu0vu6Ce7jsXOIOC9r3RkxThlt+1NwoqHb8nG4fvV
nrznoW+S8siKp75EgqxPTqjC8n7j+qwLBVOrZY+LaITXpvWkTnEblmTYkizkU9YX
7/tQYsreEvNmWWXKxBqxrO6W8N3uv1/0I/yzdLjxtUpPMmxatP6Zc29CkBttmCSR
t2pOdz6YOMkTV/SHUzHT8uWlJqbtiXOyuFjrV61yIzBxioY1Notn210a7MD6tzPs
h140BYu3YZ16d6ao/OcdC3kKUoS0FWsrxlnoRI3FfGsMNDag4SZE4AZ7A==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
messagingengine.com; h=cc:content-transfer-encoding:date:from
:in-reply-to:message-id:mime-version:references:subject:to
:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=
fm2; bh=E0rcPQHIg33RFHPXZv9oLgv14gAKtY+2Hr+YilEpXxM=; b=OBBqZ8+m
FXDjjax1FSfroUNxV9rZ1yBmnvvQvMu7uq8iK8umU2xQEywdMMEQs4HVcXya/wSL
0ThjwVsU3M6ixTFHSboZhBTVMFo7qaaNpRMm/hqYDF4Sfi176+cV0MqYoyjV5QpC
enTMqZ0h25uB+Znwo9v+fWBZL6t+0F+Oxw9YYVGigRiv2BBVgd+CA/yz9qkouIQv
NSM385WUEiPR8A5BDR0R9vePPF6gQD1VoD1DwHp+9kWBouiLeXo6a2pyDuB5rPz6
9v62J/vWSpmnK44V88FgUqRWnCMWRKRWzOyQ9DmMqrq7kJ5rr0Bti2l+e+/h+GNg
SCiPrTFjKV9sjg==
X-ME-Sender: <xms:Jes3YC66Av-4lY3o7F3eh7NNrAHAiQiXaKhOOS5GuVycP8sYN9EuSw>
<xme:Jes3YL61zNXOWbMcgSZ75ZWNr6MaXkRMoIS5uVebjWFPPaSXnLKa_9Eqt0SiZxSBo
mBbc6_vC5Pp-j9nTA>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrkeelgdduudegucetufdoteggodetrfdotf
fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen
uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne
cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgr
shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecugg
ftrfgrthhtvghrnhepvdehgfeivdejgedtveehfefhteelfefgieevgfffveefjeegtdfg
uedthedtgeevnecukfhppeejjedrudefgedrvddtfedrudekgeenucevlhhushhtvghruf
hiiigvpeegnecurfgrrhgrmhepmhgrihhlfhhrohhmpehthhhomhgrshesmhhonhhjrghl
ohhnrdhnvght
X-ME-Proxy: <xmx:Jes3YBdu-jl2tOweWz7JoSRk-aPLPHHakAFNQCgABTHmvN4v9ymKOA>
<xmx:Jes3YPL1oGKNOzAPoUwTWNXNhZRpX7xikGro393oFUWyUGpTCVfDBg>
<xmx:Jes3YGLo227CL6-7no1-xVstaUb_Vdizeh-4wPnl_RH2yHe1nZb75g>
<xmx:Jes3YO8Gaw22mAC_dnUK7bh52wfiNUxiedwF_6PGMa7Kir19EK2F9A>
Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184])
by mail.messagingengine.com (Postfix) with ESMTPA id 5A825240067;
Thu, 25 Feb 2021 13:23:32 -0500 (EST)
From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: ncopa@alpinelinux.org, stable@dpdk.org,
Hemant Agrawal <hemant.agrawal@nxp.com>,
Sachin Saxena <sachin.saxena@oss.nxp.com>,
Timothy McDaniel <timothy.mcdaniel@intel.com>,
Geoff Thorpe <geoff.thorpe@nxp.com>,
Shreyansh Jain <shreyansh.jain@nxp.com>, Gage Eads <gage.eads@intel.com>
Date: Thu, 25 Feb 2021 19:22:39 +0100
Message-Id: <20210225182250.1149592-7-thomas@monjalon.net>
X-Mailer: git-send-email 2.30.1
In-Reply-To: <20210225182250.1149592-1-thomas@monjalon.net>
References: <20190313170657.16688-1-ncopa@alpinelinux.org>
<20210225182250.1149592-1-thomas@monjalon.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v5 06/17] drivers: fix header includes for musl
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
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 <thomas@monjalon.net>
---
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