Add FAILFAST support

[zfs.git] / config / kernel.m4

diff --git a/config/kernel.m4 b/config/kernel.m4
index 4c06981..517af39 100644 (file)
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -12,6 +12,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
        ZFS_AC_KERNEL_INVALIDATE_BDEV_ARGS
        ZFS_AC_KERNEL_BDEV_LOGICAL_BLOCK_SIZE
        ZFS_AC_KERNEL_BIO_EMPTY_BARRIER
+       ZFS_AC_KERNEL_BIO_FAILFAST
        ZFS_AC_KERNEL_BIO_END_IO_T_ARGS
        ZFS_AC_KERNEL_BIO_RW_SYNCIO
        ZFS_AC_KERNEL_BLK_END_REQUEST
@@ -24,20 +25,17 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
        ZFS_AC_KERNEL_RQ_IS_SYNC
        ZFS_AC_KERNEL_RQ_FOR_EACH_SEGMENT
 
+       if test "$LINUX_OBJ" != "$LINUX"; then
+               KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"
+       fi
+       AC_SUBST(KERNELMAKE_PARAMS)
+
+
        dnl # -Wall -fno-strict-aliasing -Wstrict-prototypes and other
        dnl # compiler options are added by the kernel build system.
        KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL"
        KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\""
-       KERNELCPPFLAGS="$KERNELCPPFLAGS -I$SPL"
-       KERNELCPPFLAGS="$KERNELCPPFLAGS -I$SPL/include"
-       KERNELCPPFLAGS="$KERNELCPPFLAGS -include $SPL/spl_config.h"
-       KERNELCPPFLAGS="$KERNELCPPFLAGS -include $TOPDIR/zfs_config.h"
 
-       if test "$LINUX_OBJ" != "$LINUX"; then
-               KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"
-       fi
-
-       AC_SUBST(KERNELMAKE_PARAMS)
        AC_SUBST(KERNELCPPFLAGS)
 ])
 
@@ -171,6 +169,10 @@ AC_DEFUN([ZFS_AC_SPL_MODULE_SYMVERS], [
                SPL_SYMBOLS=Module.symvers
        elif test -r $SPL_OBJ/Modules.symvers; then
                SPL_SYMBOLS=Modules.symvers
+       elif test -r $SPL_OBJ/module/Module.symvers; then
+               SPL_SYMBOLS=Module.symvers
+       elif test -r $SPL_OBJ/module/Modules.symvers; then
+               SPL_SYMBOLS=Modules.symvers
        else
                SPL_SYMBOLS=$LINUX_SYMBOLS
        fi
@@ -222,21 +224,17 @@ AC_DEFUN([ZFS_AC_SPL], [
        AC_MSG_RESULT([$splsrc])
        AC_MSG_CHECKING([spl build directory])
        if test -z "$splbuild"; then
-               if test -d ${splsrc}/module; then
-                       splbuild=${splsrc}/module
-               else
-                       splbuild=${splsrc}
-               fi
+               splbuild=${splsrc}
        fi
        AC_MSG_RESULT([$splbuild])
 
        AC_MSG_CHECKING([spl source version])
-       if test -r $splsrc/spl_config.h &&
-               fgrep -q SPL_META_VERSION $splsrc/spl_config.h; then
+       if test -r $splbuild/spl_config.h &&
+               fgrep -q SPL_META_VERSION $splbuild/spl_config.h; then
 
                splsrcver=`(echo "#include <spl_config.h>";
                            echo "splsrcver=SPL_META_VERSION") |
-                           cpp -I $splsrc |
+                           cpp -I $splbuild |
                            grep "^splsrcver=" | cut -d \" -f 2`
        fi