From: Dmitry Eremin <dmitry.eremin@intel.com>
Date: Tue, 15 Jul 2014 12:21:23 +0000 (+0400)
Subject: LU-5334 lnet: fix build with OFED-3.5-2-MIC-beta1
X-Git-Tag: 2.6.51~84
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=fa4a67d5b4871e20acd07076e7fa15613695cae5

LU-5334 lnet: fix build with OFED-3.5-2-MIC-beta1

The stuff for RHEL6.4 should be guarded by CONFIG_COMPAT_RHEL_6_4
also in RHEL6.5. So, we need both _COMPAT_ defines in RHEL6.5.

Signed-off-by: Dmitry Eremin <dmitry.eremin@intel.com>
Change-Id: I3ce8ce50c7f823a867638f594c82d018d99c9e79
Reviewed-on: http://review.whamcloud.com/11104
Tested-by: Jenkins
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Tested-by: Maloo <hpdd-maloo@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 8d81e1c..32eae63 100644
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -332,7 +332,7 @@ directory which is likely in ${O2IBPATH%-*}
 					2.6.32-358*)
 						EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -DCONFIG_COMPAT_RHEL_6_4" ;;
 					2.6.32-431*)
-						EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -DCONFIG_COMPAT_RHEL_6_5" ;;
+						EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -DCONFIG_COMPAT_RHEL_6_4 -DCONFIG_COMPAT_RHEL_6_5" ;;
 				esac
 			elif test "x$SUSE_KERNEL" = xyes; then
 				SP=$(grep PATCHLEVEL /etc/SuSE-release | sed -e 's/.*= *//')