Cleanly support debug packages

[zfs.git] / config / kernel.m4

diff --git a/config/kernel.m4 b/config/kernel.m4
index fec157a..0adcead 100644 (file)
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -21,6 +21,13 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
        ZFS_AC_KERNEL_BIO_RW_SYNCIO
        ZFS_AC_KERNEL_REQ_SYNC
        ZFS_AC_KERNEL_BLK_END_REQUEST
+       ZFS_AC_KERNEL_BLK_QUEUE_FLUSH
+       ZFS_AC_KERNEL_BLK_QUEUE_MAX_HW_SECTORS
+       ZFS_AC_KERNEL_BLK_QUEUE_MAX_SEGMENTS
+       ZFS_AC_KERNEL_BLK_QUEUE_PHYSICAL_BLOCK_SIZE
+       ZFS_AC_KERNEL_BLK_QUEUE_IO_OPT
+       ZFS_AC_KERNEL_BLK_QUEUE_NONROT
+       ZFS_AC_KERNEL_BLK_QUEUE_DISCARD
        ZFS_AC_KERNEL_BLK_FETCH_REQUEST
        ZFS_AC_KERNEL_BLK_REQUEUE_REQUEST
        ZFS_AC_KERNEL_BLK_RQ_BYTES
@@ -32,16 +39,23 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
        ZFS_AC_KERNEL_CONST_XATTR_HANDLER
        ZFS_AC_KERNEL_XATTR_HANDLER_GET
        ZFS_AC_KERNEL_XATTR_HANDLER_SET
-       ZFS_AC_KERNEL_FSYNC_2ARGS
+       ZFS_AC_KERNEL_SHOW_OPTIONS
+       ZFS_AC_KERNEL_FSYNC
        ZFS_AC_KERNEL_EVICT_INODE
+       ZFS_AC_KERNEL_NR_CACHED_OBJECTS
+       ZFS_AC_KERNEL_FREE_CACHED_OBJECTS
+       ZFS_AC_KERNEL_FALLOCATE
        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_CALLBACK_SECURITY_INODE_INIT_SECURITY
        ZFS_AC_KERNEL_MOUNT_NODEV
+       ZFS_AC_KERNEL_SHRINK
        ZFS_AC_KERNEL_BDI
        ZFS_AC_KERNEL_BDI_SETUP_AND_REGISTER
+       ZFS_AC_KERNEL_SET_NLINK
 
        AS_IF([test "$LINUX_OBJ" != "$LINUX"], [
                KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"
@@ -265,9 +279,9 @@ AC_DEFUN([ZFS_AC_SPL], [
                fgrep -q SPL_META_VERSION $splbuild/spl_config.h], [
 
                splsrcver=`(echo "#include <spl_config.h>";
-                           echo "splsrcver=SPL_META_VERSION") |
+                           echo "splsrcver=SPL_META_VERSION-SPL_META_RELEASE") |
                            cpp -I $splbuild |
-                           grep "^splsrcver=" | cut -d \" -f 2`
+                           grep "^splsrcver=" | tr -d \" | cut -d= -f2`
        ])
 
        AS_IF([test -z "$splsrcver"], [