file cfs_lock.h was initially added on branch b_porting.

[fs/lustre-release.git] / lnet / archdep.m4

diff --git a/lnet/archdep.m4 b/lnet/archdep.m4
index 497e8c2..db70ec0 100644 (file)
--- a/lnet/archdep.m4
+++ b/lnet/archdep.m4
@@ -144,7 +144,7 @@ _ACEOF
 AC_DEFUN([LUSTRE_MODULE_COMPILE_IFELSE],
 [m4_ifvaln([$1], [LUSTRE_MODULE_CONFTEST([$1])])dnl
 rm -f kernel-tests/conftest.o kernel-tests/conftest.mod.c kernel-tests/conftest.ko
-AS_IF([AC_TRY_COMMAND(cp conftest.c kernel-tests && make [$2] -f $PWD/kernel-tests/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX EXTRA_CFLAGS="$EXTRA_KCFLAGS" $ARCH_UM SUBDIRS=$PWD/kernel-tests) >/dev/null && AC_TRY_COMMAND([$3])],
+AS_IF([AC_TRY_COMMAND(cp conftest.c kernel-tests && make [$2] -f $PWD/kernel-tests/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM SUBDIRS=$PWD/kernel-tests) >/dev/null && AC_TRY_COMMAND([$3])],
        [$4],
        [_AC_MSG_LOG_CONFTEST
 m4_ifvaln([$5],[$5])dnl])dnl
@@ -218,12 +218,13 @@ if test x$enable_modules != xno ; then
        fi
        LUSTRE_MODULE_TRY_MAKE(
                [#include <linux/version.h>],
-               [LINUXRELEASE=UTS_RELEASE],
+               [char *LINUXRELEASE;
+                LINUXRELEASE=UTS_RELEASE;],
                [$makerule LUSTRE_KERNEL_TEST=conftest.i],
                [test -s kernel-tests/conftest.i],
                [
                        # LINUXRELEASE="UTS_RELEASE"
-                       eval $(grep LINUXRELEASE kernel-tests/conftest.i)
+                       eval $(grep "LINUXRELEASE=" kernel-tests/conftest.i)
                ],[
                        AC_MSG_RESULT([unknown])
                        AC_MSG_ERROR([Could not preprocess test program.  Consult config.log for details.])
@@ -387,39 +388,6 @@ AC_SUBST(IBNAL)
 AC_SUBST(IBCPPFLAGS)
 AM_CONDITIONAL(BUILD_IBNAL, test x$IBNAL = "xibnal")
 
-def_scamac=/opt/scali/include
-AC_MSG_CHECKING([if ScaMAC support was requested])
-AC_ARG_WITH([scamac],
-       AC_HELP_STRING([--with-scamac=yes/no/path],
-                      [Path to ScaMAC includes (default=/opt/scali/include)]),
-       [
-               case $with_scamac in
-                       yes)
-                               AC_MSG_RESULT([yes])
-                               SCIMACCPPFLAGS="-I/opt/scali/include"
-                               SCIMACNAL="scimacnal"
-                               ;;
-                       no)
-                               AC_MSG_RESULT([no])
-                               SCIMACCPPFLAGS=""
-                               SCIMACNAL=""
-                               ;;
-                       *)
-                               AC_MSG_RESULT([yes])
-                               SCIMACCPPFLAGS="-I$with_scamac -I$with_scamac/icm"
-                               SCIMACNAL="scimacnal"
-                               ;;
-               esac
-       ],[
-               AC_MSG_RESULT([no])
-               SCIMACCPPFLAGS=""
-               SCIMACNAL=""
-       ])
-AC_SUBST(SCIMACCPPFLAGS)
-AC_SUBST(SCIMACNAL)
-AM_CONDITIONAL(BUILD_SCIMACNAL, test x$SCIMACNAL = "xscimacnal")
-# if test "$with_scamac" != no -a -f ${with_scamac}/scamac.h; then
-
 AC_SUBST(MOD_LINK)
 AC_SUBST(LINUX25)
 
@@ -472,6 +440,20 @@ LUSTRE_MODULE_TRY_COMPILE(
                AC_MSG_RESULT([$LINUXRELEASE])
        ])
 
+# ---------- 2.4.20 introduced cond_resched --------------
+
+AC_MSG_CHECKING([if kernel offers cond_resched])
+LUSTRE_MODULE_TRY_COMPILE(
+       [
+               #include <linux/sched.h>
+       ],[
+               cond_resched();
+       ],[
+       AC_MSG_RESULT([yes])
+               AC_DEFINE(HAVE_COND_RESCHED, 1, [cond_resched found])
+       ],[
+               AC_MSG_RESULT([no])
+       ])
 # ---------- Red Hat 2.4.21 backports some more 2.5 bits --------
 
 AC_MSG_CHECKING([if kernel defines PDE])
@@ -577,6 +559,17 @@ if test x$enable_modules != xno ; then
        fi # BACKINGFS = ext3
 fi
 
+# ---------- check ->lookup_raw() support --------
+
+AC_MSG_CHECKING([if kernel supports ->lookup_raw()])
+HAVE_LOOKUP_RAW="`grep -c 'lookup_raw.*struct inode' $LINUX/include/linux/fs.h`"
+if test "$HAVE_LOOKUP_RAW" != 0 ; then
+       AC_DEFINE(HAVE_LOOKUP_RAW, 1, [the kernel supports ->lookup_raw()])
+       AC_MSG_RESULT([yes])
+else
+       AC_MSG_RESULT([no])
+fi
+
 CPPFLAGS="-include \$(top_builddir)/include/config.h $CPPFLAGS"
 EXTRA_KCFLAGS="-include $PWD/include/config.h $EXTRA_KCFLAGS"
 AC_SUBST(EXTRA_KCFLAGS)