Linux compat 2.6.39: mount_nodev()

[zfs.git] / config / kernel.m4

diff --git a/config/kernel.m4 b/config/kernel.m4
index 8b4a5c7..90dc6c0 100644 (file)
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -34,6 +34,12 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
        ZFS_AC_KERNEL_XATTR_HANDLER_SET
        ZFS_AC_KERNEL_FSYNC_2ARGS
        ZFS_AC_KERNEL_EVICT_INODE
+       ZFS_AC_KERNEL_INSERT_INODE_LOCKED
+       ZFS_AC_KERNEL_D_OBTAIN_ALIAS
+       ZFS_AC_KERNEL_CHECK_DISK_SIZE_CHANGE
+       ZFS_AC_KERNEL_TRUNCATE_SETSIZE
+       ZFS_AC_KERNEL_6ARGS_SECURITY_INODE_INIT_SECURITY
+       ZFS_AC_KERNEL_MOUNT_NODEV
 
        if test "$LINUX_OBJ" != "$LINUX"; then
                KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"
@@ -43,6 +49,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
 
        dnl # -Wall -fno-strict-aliasing -Wstrict-prototypes and other
        dnl # compiler options are added by the kernel build system.
+       KERNELCPPFLAGS="$KERNELCPPFLAGS $NO_UNUSED_BUT_SET_VARIABLE"
        KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL"
        KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\""
 
@@ -61,6 +68,14 @@ AC_DEFUN([ZFS_AC_MODULE_SYMVERS], [
                else
                        LINUX_SYMBOLS=Module.symvers
                fi
+
+               if ! test -f "$LINUX_OBJ/$LINUX_SYMBOLS"; then
+                       AC_MSG_ERROR([
+       *** Please make sure the kernel devel package for your distribution
+       *** is installed.  If your building with a custom kernel make sure the
+       *** kernel is configured, built, and the '--with-linux=PATH' configure
+       *** option refers to the location of the kernel source.])
+               fi
        else
                LINUX_SYMBOLS=NONE
        fi