From 433231e0986b2bf8fa5f298c0983cf0b0707b4ae Mon Sep 17 00:00:00 2001 From: Patrick McCormick Date: Sun, 12 Feb 2017 10:10:03 +0200 Subject: [PATCH] Fixed scif compilation environment MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Include instead of and adjust the makefiles accordingly. This has to be done because including the parent directory also ropes in the host kernel’s include directories, which breaks the build of core on some configurations. Check for the IBP and SCIF config keys when adding scif.h paths to CFLAGS, before only the SCIF key was checked even though both depend on scif and can be compiled separately. Signed-off-by: Patrick McCormick patrick.m.mccormick@intel.com --- .../0007-Add-CCL-Direct-ibp-drivers-to-Infiniband.patch | 6 +++--- .../0008-Add-ibscif-to-the-Infiniband-HW-directory.patch | 2 +- .../xeon-phi/0010-Update-qib-for-XEON-PHI-support.patch | 2 +- tech-preview/xeon-phi/0013-have-upstream-scif.patch | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tech-preview/xeon-phi/0007-Add-CCL-Direct-ibp-drivers-to-Infiniband.patch b/tech-preview/xeon-phi/0007-Add-CCL-Direct-ibp-drivers-to-Infiniband.patch index a01b7df..3df648d 100644 --- a/tech-preview/xeon-phi/0007-Add-CCL-Direct-ibp-drivers-to-Infiniband.patch +++ b/tech-preview/xeon-phi/0007-Add-CCL-Direct-ibp-drivers-to-Infiniband.patch @@ -1516,7 +1516,7 @@ diff -ruN a6/drivers/infiniband/ibp/cm/common.h a7/drivers/infiniband/ibp/cm/com +#include +#include +#include -+#include ++#include + +#define DRV_DESC "CCL Direct CM " DRV_ROLE +#define DRV_VERSION "1.0" @@ -2345,7 +2345,7 @@ diff -ruN a6/drivers/infiniband/ibp/drv/common.h a7/drivers/infiniband/ibp/drv/c +#include +#include +#include -+#include ++#include + +#define DRV_DESC "CCL Direct " DRV_ROLE +#define DRV_VERSION "1.0" @@ -7421,7 +7421,7 @@ diff -ruN a6/drivers/infiniband/ibp/sa/common.h a7/drivers/infiniband/ibp/sa/com +#include +#include +#include -+#include ++#include + +#define DRV_DESC "CCL Direct SA " DRV_ROLE +#define DRV_VERSION "1.0" diff --git a/tech-preview/xeon-phi/0008-Add-ibscif-to-the-Infiniband-HW-directory.patch b/tech-preview/xeon-phi/0008-Add-ibscif-to-the-Infiniband-HW-directory.patch index bae7918..763dfad 100644 --- a/tech-preview/xeon-phi/0008-Add-ibscif-to-the-Infiniband-HW-directory.patch +++ b/tech-preview/xeon-phi/0008-Add-ibscif-to-the-Infiniband-HW-directory.patch @@ -965,7 +965,7 @@ diff -ruN a/drivers/infiniband/hw/scif/ibscif_driver.h b/drivers/infiniband/hw/s +#include +#include + -+#include ++#include +#include "ibscif_protocol.h" + +#define IBSCIF_MTU 4096 diff --git a/tech-preview/xeon-phi/0010-Update-qib-for-XEON-PHI-support.patch b/tech-preview/xeon-phi/0010-Update-qib-for-XEON-PHI-support.patch index 6df627b..65da4f7 100644 --- a/tech-preview/xeon-phi/0010-Update-qib-for-XEON-PHI-support.patch +++ b/tech-preview/xeon-phi/0010-Update-qib-for-XEON-PHI-support.patch @@ -690,7 +690,7 @@ diff -ruN a9/drivers/infiniband/hw/qib/qib_knx.c a10/drivers/infiniband/hw/qib/q +#include +#include +#include -+#include ++#include + +#include "qib.h" +#include "qib_knx.h" diff --git a/tech-preview/xeon-phi/0013-have-upstream-scif.patch b/tech-preview/xeon-phi/0013-have-upstream-scif.patch index 23fbfae..366c853 100644 --- a/tech-preview/xeon-phi/0013-have-upstream-scif.patch +++ b/tech-preview/xeon-phi/0013-have-upstream-scif.patch @@ -98,7 +98,7 @@ diff -Nrup a/drivers/infiniband/hw/scif/ibscif_driver.h b/drivers/infiniband/hw/ --- a/drivers/infiniband/hw/scif/ibscif_driver.h 2015-10-08 07:44:08.727979908 -0700 +++ b/drivers/infiniband/hw/scif/ibscif_driver.h 2015-10-08 07:44:52.759981899 -0700 @@ -74,6 +74,11 @@ - #include + #include #include "ibscif_protocol.h" +#ifdef HAVE_UPSTREAM_SCIF -- 2.46.0