b=21951 2.6.32-fc13 patchless client support for HEAD

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

diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4
index 6cba402..49c5a21 100644 (file)
--- a/libcfs/autoconf/lustre-libcfs.m4
+++ b/libcfs/autoconf/lustre-libcfs.m4
@@ -213,56 +213,6 @@ LB_LINUX_TRY_COMPILE([
 EXTRA_KCFLAGS="$tmp_flags"
 ])
 
-# check userland size_t type
-AC_DEFUN([LIBCFS_SIZE_T_LONG],
-[AC_MSG_CHECKING([size_t is unsigned long type])
-tmp_flags="$CFLAGS"
-CFLAGS="$CFLAGS -Werror"
-AC_COMPILE_IFELSE([
-       #include <linux/types.h>
-       #include <linux/stddef.h>
-       int main(void) {
-               unsigned long *data1;
-               size_t *data2 = NULL;
-
-               data1 = data2;
-               return 0;
-       }
-],[
-       AC_MSG_RESULT([yes])
-        AC_DEFINE(HAVE_SIZE_T_LONG, 1,
-                  [size_t is long type])
-],[
-       AC_MSG_RESULT([no])
-])
-CFLAGS="$tmp_flags"
-])
-
-AC_DEFUN([LIBCFS_SSIZE_T_LONG],
-[AC_MSG_CHECKING([ssize_t is signed long type])
-tmp_flags="$CFLAGS"
-CFLAGS="$CFLAGS -Werror"
-AC_COMPILE_IFELSE([
-       #include <linux/types.h>
-       #include <linux/stddef.h>
-       int main(void) {
-               long *data1;
-               ssize_t *data2 = NULL;
-
-               data1 = data2;
-               return 0;
-       }
-],[
-       AC_MSG_RESULT([yes])
-        AC_DEFINE(HAVE_SSIZE_T_LONG, 1,
-                  [ssize_t is long type])
-],[
-       AC_MSG_RESULT([no])
-])
-CFLAGS="$tmp_flags"
-])
-
-
 # check if task_struct with rcu memeber
 AC_DEFUN([LIBCFS_TASK_RCU],
 [AC_MSG_CHECKING([if task_struct has a rcu field])
@@ -502,6 +452,22 @@ LB_LINUX_TRY_COMPILE([
 ])
 ])
 
+# from 2.6.24 please use sg_init_table
+AC_DEFUN([LIBCFS_SCATTERLIST_INITTABLE],
+[AC_MSG_CHECKING([if sg_init_table is defined])
+LB_LINUX_TRY_COMPILE([
+        #include <linux/scatterlist.h>
+],[
+       sg_init_table(NULL,0);
+],[
+        AC_MSG_RESULT(yes)
+        AC_DEFINE(HAVE_SCATTERLIST_INITTABLE, 1,
+                  [sg_init_table is defined])
+],[
+        AC_MSG_RESULT(NO)
+])
+])
+
 # 2.6.24 
 AC_DEFUN([LIBCFS_NETWORK_NAMESPACE],
 [AC_MSG_CHECKING([for network stack has namespaces])
@@ -672,15 +638,15 @@ LB_LINUX_TRY_COMPILE([
 AC_DEFUN([LIBCFS_STRUCT_CRED_IN_TASK],
 [AC_MSG_CHECKING([if kernel has struct cred])
 LB_LINUX_TRY_COMPILE([
-       #include <linux/sched.h>
+       #include <linux/sched.h>
 ],[
-       struct task_struct *tsk = NULL;
-       tsk->real_cred = NULL;
+       struct task_struct *tsk = NULL;
+       tsk->real_cred = NULL;
 ],[
-       AC_MSG_RESULT([yes])
-       AC_DEFINE(HAVE_STRUCT_CRED, 1, [struct cred found])
+       AC_MSG_RESULT([yes])
+       AC_DEFINE(HAVE_STRUCT_CRED, 1, [struct cred found])
 ],[
-       AC_MSG_RESULT([no])
+       AC_MSG_RESULT([no])
 ])
 ])
 
@@ -724,8 +690,6 @@ LIBCFS_STRUCT_PAGE_LIST
 LIBCFS_STRUCT_SIGHAND
 LIBCFS_FUNC_SHOW_TASK
 LIBCFS_U64_LONG_LONG
-LIBCFS_SSIZE_T_LONG
-LIBCFS_SIZE_T_LONG
 LIBCFS_TASK_RCU
 # 2.6.18
 LIBCFS_TASKLIST_LOCK
@@ -745,6 +709,7 @@ LIBCFS_NETLINK_CBMUTEX
 # 2.6.24
 LIBCFS_SYSCTL_UNNUMBERED
 LIBCFS_SCATTERLIST_SETPAGE
+LIBCFS_SCATTERLIST_INITTABLE
 LIBCFS_NL_BROADCAST_GFP
 LIBCFS_NETWORK_NAMESPACE
 LIBCFS_NETLINK_NETNS
@@ -803,6 +768,36 @@ AC_CHECK_TYPE([umode_t],
        [],
        [#include <asm/types.h>])
 
+AC_CHECK_TYPE([__s8],
+       [AC_DEFINE(HAVE___S8, 1, [__s8 is defined])],
+       [],
+       [#include <asm/types.h>])
+
+AC_CHECK_TYPE([__u8],
+       [AC_DEFINE(HAVE___U8, 1, [__u8 is defined])],
+       [],
+       [#include <asm/types.h>])
+
+AC_CHECK_TYPE([__s16],
+       [AC_DEFINE(HAVE___S16, 1, [__s16 is defined])],
+       [],
+       [#include <asm/types.h>])
+
+AC_CHECK_TYPE([__u16],
+       [AC_DEFINE(HAVE___U16, 1, [__u16 is defined])],
+       [],
+       [#include <asm/types.h>])
+
+AC_CHECK_TYPE([__s32],
+       [AC_DEFINE(HAVE___S32, 1, [__s32 is defined])],
+       [],
+       [#include <asm/types.h>])
+
+AC_CHECK_TYPE([__u32],
+       [AC_DEFINE(HAVE___U32, 1, [__u32 is defined])],
+       [],
+       [#include <asm/types.h>])
+
 AC_CHECK_TYPE([__u64],
        [AC_DEFINE(HAVE___U64, 1, [__u64 is defined])],
        [],
@@ -887,16 +882,9 @@ libcfs/include/libcfs/util/Makefile
 libcfs/libcfs/Makefile
 libcfs/libcfs/autoMakefile
 libcfs/libcfs/linux/Makefile
-libcfs/libcfs/ulinux/Makefile
 libcfs/libcfs/posix/Makefile
 libcfs/libcfs/util/Makefile
-])
-case $lb_target_os in
-       darwin)
-               AC_CONFIG_FILES([
 libcfs/include/libcfs/darwin/Makefile
 libcfs/libcfs/darwin/Makefile
 ])
-               ;;
-esac
 ])