From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by dpdk.org (Postfix) with ESMTP id 349111BB37; Thu, 21 Jun 2018 10:28:51 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 9E2B3218FD; Thu, 21 Jun 2018 04:28:50 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Thu, 21 Jun 2018 04:28:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=mesmtp; bh=fcbUsGkgVT29LQBJjZgk/a/nN3 sGl79ehn9+kDGmCVc=; b=eurURofhN4DMPsaWEpIuvGX+3rqqBI03JYiar0+XKL KcItqibG0+xtui5mhq+qmMx2zt9JkANIPkF/EeUnflrXQlxArv+3IX2WXiHC3ms2 48/og+KvhNeHegDljB5FR3t2tbtTLQgFCcwqmJFMT2HCmZy4Xd93FPmGPTUl7NF4 4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=fcbUsG kgVT29LQBJjZgk/a/nN3sGl79ehn9+kDGmCVc=; b=KrjV0UOgOTwlpPgV3eZwYU 7pHpE+Or4eL19/biIdqhyWYTr1enLfh9Nc3alYwSyY0klO8HZJ3qWsPnA6wdiOSG Pm+teu6WmLL2RHOU6tm0IQOoMPq3xph26v5WBM3aQiWUMG9ABYzYw+lyOqXsERz+ LlixziZSvbQTtxS1xpfMHY8rsk9XDqc9sS2aC6M4+n/xLzmuONkI66mlaSE5afcV uA6LMEi5w5NgLHwNRABA5QjXe3D3NV3b47mVPJrlJYdDhyb1GUMaOOc42uF1q+0X Ihz8fPb1m/d9vAJUHr4+2w45eYUp05BHluSHml/bbDNsb+mc5uUsxGJiszDk6OgQ == X-ME-Proxy: X-ME-Sender: Received: from xps.localnet (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 9AEDD102AB; Thu, 21 Jun 2018 04:28:49 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: Shreyansh Jain , stable@dpdk.org, hemant.agrawal@nxp.com, Jerin Jacob Date: Thu, 21 Jun 2018 10:28:48 +0200 Message-ID: <5065687.f9pk0mkCQI@xps> In-Reply-To: References: <20180620140930.31002-1-thomas@monjalon.net> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Subject: Re: [dpdk-dev] [PATCH] bus/dpaa: fix build X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jun 2018 08:28:51 -0000 21/06/2018 09:58, Shreyansh Jain: > On Wednesday 20 June 2018 07:39 PM, Thomas Monjalon wrote: > > The DPAA bus driver is defining some macros without prefix. > > So it can conflict with other libraries like libbsd: > > > > drivers/bus/dpaa/include/compat.h:53: > > error: "__packed" redefined > > /usr/include/bsd/sys/cdefs.h:120: > > note: this is the location of the previous definition > > > > Fixes: 39f373cf015a ("bus/dpaa: add compatibility and helper macros") > > Cc: stable@dpdk.org > > Cc: geoff.thorpe@nxp.com > > Cc: hemant.agrawal@nxp.com > > Cc: shreyansh.jain@nxp.com > > > > Signed-off-by: Thomas Monjalon > > --- > > drivers/bus/dpaa/include/compat.h | 6 ++++++ > > 1 file changed, 6 insertions(+) > > > > diff --git a/drivers/bus/dpaa/include/compat.h b/drivers/bus/dpaa/include/compat.h > > index e4b570214..92241d231 100644 > > --- a/drivers/bus/dpaa/include/compat.h > > +++ b/drivers/bus/dpaa/include/compat.h > > @@ -48,9 +48,15 @@ > > */ > > > > /* Required compiler attributes */ > > +#ifndef __maybe_unused > > #define __maybe_unused __rte_unused > > +#endif > > +#ifndef __always_unused > > #define __always_unused __rte_unused > > +#endif > > +#ifndef __packed > > #define __packed __rte_packed > > +#endif > > #define noinline __attribute__((noinline)) > > > > #define L1_CACHE_BYTES 64 > > > > A similar patch was also issued by Jerin a few weeks back: > http://patches.dpdk.org/patch/40597/ I missed it. > There may be conflict while merging. > > Whether you take that, or this (preferred): > > Acked-by: Shreyansh Jain This one is more complete. Applied