Updated 0017-better-scif-detection.patch

Signed-off-by: Patrick McCormick <patrick.m.mccormick@intel.com>

diff --git a/tech-preview/xeon-phi/0017-better-scif-detection.patch b/tech-preview/xeon-phi/0017-better-scif-detection.patch
index b28df0211c73ffb63b7b93a4d4b27db4344945d9..95ae0b49d46edc03d2813fff794d506dd95280cd 100644 (file)
--- a/tech-preview/xeon-phi/0017-better-scif-detection.patch
+++ b/tech-preview/xeon-phi/0017-better-scif-detection.patch
@@ -1,16 +1,18 @@
 diff --git a/makefile b/makefile
-index 6aaf70d..3c23862 100644
+index 6aaf70d..7567358 100644
 --- a/makefile
 +++ b/makefile
-@@ -25,6 +25,13 @@ CFLAGS += \
+@@ -25,6 +25,15 @@ CFLAGS += \
        -DCOMPAT_PROJECT="\"Compat-rdma\"" \
        -DCOMPAT_VERSION="\"$(shell cat compat_version)\"" \
  
-+ifneq ($(CONFIG_INFINIBAND_SCIF),)
-+SCIF_HEADER:=/usr/src/kernels/$(KVERSION)/include/
-+CFLAGS += -I$(SCIF_HEADER)
++ifneq ($(CONFIG_INFINIBAND_SCIF)$(CONFIG_IBP_SERVER),)
++SCIF_HEADER3X:=/usr/src/kernels/$(KVERSION)/include/modules/
++SCIF_HEADER4X:=/usr/src/mpss-modules/
++CFLAGS += -I$(SCIF_HEADER3X)
++CFLAGS += -I$(SCIF_HEADER4X)
 +CFLAGS += \
-+       $(shell if grep -R -q scif_get_node_ids $(SCIF_HEADER) 2>/dev/null; then echo -n -DHAVE_UPSTREAM_SCIF; fi)
++       $(shell if grep -R -q scif_get_node_ids $(SCIF_HEADER3X)/* $(SCIF_HEADER4X)/* 2>/dev/null; then echo -n -DHAVE_UPSTREAM_SCIF; fi)
 +endif
 +
  DEPMOD  = /sbin/depmod