LU-2392 kerberos: GSS keyring is broken >=2.6.29

[fs/lustre-release.git] / libcfs / autoconf / lustre-libcfs.m4

diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4
index 389e4de..312542d 100644 (file)
--- a/libcfs/autoconf/lustre-libcfs.m4
+++ b/libcfs/autoconf/lustre-libcfs.m4
@@ -214,6 +214,21 @@ LB_LINUX_TRY_COMPILE([
                AC_MSG_RESULT(no)
        ])
 
+       AC_MSG_CHECKING([whether OFED backports have cpumask_of_node])
+       # Some OFED has cpumask_of_node backports defined in
+       # its private include/linux/cpumask.h. However, it is
+       # defined conflictingly with kernel's cpumask_of_node.
+       if test -f $OFED_BACKPORT_PATH/linux/cpumask.h; then
+               grep -q cpumask_of_node $OFED_BACKPORT_PATH/linux/cpumask.h 2>/dev/null
+               rc=$?
+               if test $rc -eq 0; then
+                       AC_DEFINE(HAVE_OFED_CPUMASK_OF_NODE, 1, [have cpumask_of_node])
+                       AC_MSG_RESULT(yes)
+               else
+                       AC_MSG_RESULT(no)
+               fi
+       fi
+
        AC_MSG_CHECKING([whether have cpumask_of_node])
        LB_LINUX_TRY_COMPILE([
                #include <linux/topology.h>
@@ -226,6 +241,18 @@ LB_LINUX_TRY_COMPILE([
                AC_MSG_RESULT(no)
        ])
 
+       AC_MSG_CHECKING([whether have cpumask_copy])
+       LB_LINUX_TRY_COMPILE([
+               #include <linux/cpumask.h>
+       ],[
+               cpumask_copy(NULL, NULL);
+       ],[
+               AC_DEFINE(HAVE_CPUMASK_COPY, 1, [have cpumask_copy])
+               AC_MSG_RESULT(yes)
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+
        AC_MSG_CHECKING([whether have node_to_cpumask])
        LB_LINUX_TRY_COMPILE([
                #include <linux/topology.h>
@@ -340,7 +367,7 @@ LB_LINUX_TRY_COMPILE([
 ],[
         AC_MSG_RESULT(yes)
         AC_DEFINE(HAVE_SCATTERLIST_SETPAGE, 1,
-                  [struct scatterlist has page member])
+                  [struct scatterlist has no page member])
 ],[
         AC_MSG_RESULT(NO)
 ])
@@ -620,6 +647,15 @@ AC_DEFUN([LIBCFS_HAVE_OOM_H],
 ])
 ])
 
+AC_DEFUN([LIBCFS_HAVE_KEYTYPE_H],
+[LB_CHECK_FILE([$LINUX/include/linux/key-type.h], [
+        AC_DEFINE(HAVE_LINUX_KEYTYPE_H, 1,
+                [kernel has include/key-type.h])
+],[
+        AC_MSG_RESULT([no])
+])
+])
+
 #
 # check set_mems_allowed
 # 2.6.31 adds function set_mems_allowed in cpuset.h
@@ -785,6 +821,7 @@ LIBCFS_SCATTERLIST_SETPAGE
 LIBCFS_SCATTERLIST_INITTABLE
 LIBCFS_NETWORK_NAMESPACE
 LIBCFS_FUNC_DUMP_TRACE
+LIBCFS_HAVE_KEYTYPE_H
 # 2.6.26
 LIBCFS_SEM_COUNT
 # 2.6.27
@@ -917,6 +954,7 @@ AC_COMPILE_IFELSE([
                __u64 *data2 = NULL;
 
                data1 = data2;
+               data2 = data1;
                return 0;
        }
 ],[