From mboxrd@z Thu Jan  1 00:00:00 1970
From: Anatoly Burakov <anatoly.burakov@intel.com>
Subject: [PATCH v2 2/7] pci/vfio: improve musl compatibility
Date: Thu, 20 Sep 2018 16:27:16 +0100
Message-ID: <bbd93ae59fb933710f836b3b152c9d21fdf0c6d3.1537456998.git.anatoly.burakov@intel.com>
References: <cover.1537456998.git.anatoly.burakov@intel.com>
Cc: dpdk@stormmq.com, bruce.richardson@intel.com, stephen@networkplumber.org
To: dev@dpdk.org
Return-path: <dev-bounces@dpdk.org>
Received: from mga06.intel.com (mga06.intel.com [134.134.136.31])
 by dpdk.org (Postfix) with ESMTP id D96E25F65
 for <dev@dpdk.org>; Thu, 20 Sep 2018 17:28:42 +0200 (CEST)
In-Reply-To: <cover.1537456998.git.anatoly.burakov@intel.com>
In-Reply-To: <cover.1537456998.git.anatoly.burakov@intel.com>
References: <cover.1535543250.git.anatoly.burakov@intel.com>
 <cover.1537456998.git.anatoly.burakov@intel.com>
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>

Musl already has PAGE_SIZE defined, and our define clashed with it.
Rename our define to SYS_PAGE_SIZE.

Bugzilla ID: 36

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 drivers/bus/pci/linux/pci_vfio.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index 686386d6a..85f6c9803 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -35,7 +35,9 @@
 
 #ifdef VFIO_PRESENT
 
+#ifndef PAGE_SIZE
 #define PAGE_SIZE   (sysconf(_SC_PAGESIZE))
+#endif
 #define PAGE_MASK   (~(PAGE_SIZE - 1))
 
 static struct rte_tailq_elem rte_vfio_tailq = {
-- 
2.17.1