Linux 3.6 compat, sget()

[zfs.git] / config / kernel.m4

diff --git a/config/kernel.m4 b/config/kernel.m4
index c08b6a2..3a144a3 100644 (file)
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -53,6 +53,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
        ZFS_AC_KERNEL_CREATE_UMODE_T
        ZFS_AC_KERNEL_AUTOMOUNT
        ZFS_AC_KERNEL_ENCODE_FH_WITH_INODE
+       ZFS_AC_KERNEL_COMMIT_METADATA
        ZFS_AC_KERNEL_CLEAR_INODE
        ZFS_AC_KERNEL_INSERT_INODE_LOCKED
        ZFS_AC_KERNEL_D_MAKE_ROOT
@@ -66,6 +67,8 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
        ZFS_AC_KERNEL_BDI
        ZFS_AC_KERNEL_BDI_SETUP_AND_REGISTER
        ZFS_AC_KERNEL_SET_NLINK
+       ZFS_AC_KERNEL_ELEVATOR_CHANGE
+       ZFS_AC_KERNEL_5ARG_SGET
 
        AS_IF([test "$LINUX_OBJ" != "$LINUX"], [
                KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"
@@ -302,6 +305,13 @@ AC_DEFUN([ZFS_AC_SPL], [
                        sourcelink=../spl
                ])
 
+               dnl #
+               dnl # Look in the kernel directory
+               dnl #
+               AS_IF([test -z "$sourcelink" || test ! -e $sourcelink/spl_config.h], [
+                       sourcelink="$LINUX"
+               ])
+
                AS_IF([test -e $sourcelink/spl_config.h], [
                        splsrc=`readlink -f ${sourcelink}`
                ], [
@@ -386,29 +396,10 @@ AC_DEFUN([ZFS_AC_KERNEL_CONFIG], [
                        [Define to 1 if licensed under the GPL])
        ])
 
-       ZFS_AC_KERNEL_CONFIG_PREEMPT
        ZFS_AC_KERNEL_CONFIG_DEBUG_LOCK_ALLOC
 ])
 
 dnl #
-dnl # Check CONFIG_PREEMPT
-dnl #
-dnl # Premptible kernels will be supported in the future.  But at the
-dnl # moment there are a few places in the code which need to be updated
-dnl # to accomidate them.  Until that work occurs we should detect this
-dnl # at configure time and fail with a sensible message.  Otherwise,
-dnl # people will be able to build successfully, however they will have
-dnl # stability problems.  See https://github.com/zfsonlinux/zfs/issues/83
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_CONFIG_PREEMPT], [
-
-       ZFS_LINUX_CONFIG([PREEMPT],
-               AC_MSG_ERROR([
-       *** Kernel built with CONFIG_PREEMPT which is not supported.
-       *** You must rebuild your kernel without this option.]), [])
-])
-
-dnl #
 dnl # Check CONFIG_DEBUG_LOCK_ALLOC
 dnl #
 dnl # This is typically only set for debug kernels because it comes with