diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index 6ed99bf..db72c65 100644
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -365,7 +365,7 @@ LB_LINUX_TRY_COMPILE([
 	rdma_create_id(NULL, NULL, 0, 0);
 ],[
 	AC_MSG_RESULT([yes])
-	AC_DEFINE(HAVE_RDMA_CREATE_ID_4ARG, 1, [rdma_create_id wants 4 args])
+	RDMA_CREATE_ID_4ARG=1
 ],[
 	AC_MSG_RESULT([no])
 ])
@@ -422,6 +422,11 @@ else
 		EXTRA_KCFLAGS="$EXTRA_KCFLAGS $O2IBCPPFLAGS"
 		EXTRA_LNET_INCLUDE="$EXTRA_LNET_INCLUDE $O2IBCPPFLAGS"
 
+		if test $RDMA_CREATE_ID_4ARG -a $ENABLEO2IB -ne 3; then
+		cat >>confdefs.h <<\_ACEOF
+#define HAVE_RDMA_CREATE_ID_4ARG 1
+_ACEOF
+		fi
 		LB_LINUX_TRY_COMPILE([
 		        #include <linux/version.h>
 		        #include <linux/pci.h>