Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
04f61a6
..
312542d
100644
(file)
--- a/
libcfs/autoconf/lustre-libcfs.m4
+++ b/
libcfs/autoconf/lustre-libcfs.m4
@@
-367,7
+367,7
@@
LB_LINUX_TRY_COMPILE([
],[
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_SCATTERLIST_SETPAGE, 1,
],[
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)
])
],[
AC_MSG_RESULT(NO)
])
@@
-647,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
#
# check set_mems_allowed
# 2.6.31 adds function set_mems_allowed in cpuset.h
@@
-812,6
+821,7
@@
LIBCFS_SCATTERLIST_SETPAGE
LIBCFS_SCATTERLIST_INITTABLE
LIBCFS_NETWORK_NAMESPACE
LIBCFS_FUNC_DUMP_TRACE
LIBCFS_SCATTERLIST_INITTABLE
LIBCFS_NETWORK_NAMESPACE
LIBCFS_FUNC_DUMP_TRACE
+LIBCFS_HAVE_KEYTYPE_H
# 2.6.26
LIBCFS_SEM_COUNT
# 2.6.27
# 2.6.26
LIBCFS_SEM_COUNT
# 2.6.27
@@
-944,6
+954,7
@@
AC_COMPILE_IFELSE([
__u64 *data2 = NULL;
data1 = data2;
__u64 *data2 = NULL;
data1 = data2;
+ data2 = data1;
return 0;
}
],[
return 0;
}
],[