From: James Simmons <uja.ornl@yahoo.com>
Date: Mon, 13 Jul 2015 14:01:37 +0000 (-0400)
Subject: LU-6790 build: handle external Intel OFED stack
X-Git-Tag: 2.7.57~2
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F82%2F15582%2F2;p=fs%2Flustre-release.git

LU-6790 build: handle external Intel OFED stack

Besides the Mellanox stack Intel also releases their own
OFED stack. Just like the Mellanox stack this Intel OFED
stack has a compatibility layer to support distributions
kernels. This layer provided stomps over the default
kernel headers so like the Mellanox stack compact-2.6.h
has to be placed before all other headers. The reason
it didn't show up before with the Mellanox stacks is the
Intel stack additionally stomps the pci layer of the
kernel.

Change-Id: If565f25432cf87723b69e5d65e00a7d5d301dc4f
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-on: http://review.whamcloud.com/15582
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Chris Horn <hornc@cray.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index 84d8b26..649e484 100644
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -268,12 +268,12 @@ directory which is likely in ${O2IBPATH%-*}
 		EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -I$O2IBPATH/include"
 		LB_CHECK_COMPILE([whether to enable OpenIB gen2 support],
 		openib_gen2_support, [
-			#include <linux/version.h>
-			#include <linux/pci.h>
-			#include <linux/gfp.h>
 			#ifdef HAVE_COMPAT_RDMA
 			#include <linux/compat-2.6.h>
 			#endif
+			#include <linux/version.h>
+			#include <linux/pci.h>
+			#include <linux/gfp.h>
 			#include <rdma/rdma_cm.h>
 			#include <rdma/ib_cm.h>
 			#include <rdma/ib_verbs.h>