Branch b1_4

b=14265
i=deen
i=scjody

Fix build failes for RHEL3.

diff --git a/ldiskfs/configure.ac b/ldiskfs/configure.ac
index 1455213..5c170c1 100644 (file)
--- a/ldiskfs/configure.ac
+++ b/ldiskfs/configure.ac
@@ -49,8 +49,10 @@ AC_MSG_RESULT([$enable_modules])
 
 if test x$enable_modules = xyes ; then
        LB_PROG_LINUX
+if test x$linux25 = xyes ; then
        LB_LINUX_MODPOST
 fi
+fi
 
 LB_CONFIG_HEADERS
 

diff --git a/lnet/klnds/socklnd/socklnd.h b/lnet/klnds/socklnd/socklnd.h
index b83426e..b3adc3b 100644 (file)
--- a/lnet/klnds/socklnd/socklnd.h
+++ b/lnet/klnds/socklnd/socklnd.h
@@ -367,6 +367,10 @@ extern ksock_proto_t ksocknal_protocol_v2x;
 #define KSOCK_PROTO_V1_MINOR    LNET_PROTO_TCP_VERSION_MINOR
 #define KSOCK_PROTO_V1          KSOCK_PROTO_V1_MAJOR
 
+#ifndef CPU_MASK_NONE
+#define CPU_MASK_NONE   0UL
+#endif
+
 static inline int
 ksocknal_route_mask(void) 
 {