Add CODE_OF_CONDUCT.md

[mirror_zfs.git] / config / kernel.m4

diff --git a/config/kernel.m4 b/config/kernel.m4
index 118f1d8dc5b0c7a27969c02307e21ee296e051b5..f7d657e0ca3160a1809434812a338c332bb0d700 100644 (file)
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -4,6 +4,7 @@ dnl #
 AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
        ZFS_AC_KERNEL
        ZFS_AC_QAT
+       ZFS_AC_KERNEL_ACCESS_OK_TYPE
        ZFS_AC_TEST_MODULE
        ZFS_AC_KERNEL_MISC_MINOR
        ZFS_AC_KERNEL_OBJTOOL
@@ -161,6 +162,10 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
        ZFS_AC_KERNEL_ACL_HAS_REFCOUNT
        ZFS_AC_KERNEL_USERNS_CAPABILITIES
        ZFS_AC_KERNEL_IN_COMPAT_SYSCALL
+       ZFS_AC_KERNEL_KTIME_GET_COARSE_REAL_TS64
+       ZFS_AC_KERNEL_TOTALRAM_PAGES_FUNC
+       ZFS_AC_KERNEL_BLK_QUEUE_DISCARD
+       ZFS_AC_KERNEL_BLK_QUEUE_SECURE_ERASE
 
        AS_IF([test "$LINUX_OBJ" != "$LINUX"], [
                KERNEL_MAKE="$KERNEL_MAKE O=$LINUX_OBJ"
@@ -275,7 +280,7 @@ AC_DEFUN([ZFS_AC_KERNEL], [
        AS_IF([test "$utsrelease"], [
                kernsrcver=`(echo "#include <$utsrelease>";
                             echo "kernsrcver=UTS_RELEASE") |
-                            cpp -I $kernelbuild/include |
+                            ${CPP} -I $kernelbuild/include - |
                             grep "^kernsrcver=" | cut -d \" -f 2`
 
                AS_IF([test -z "$kernsrcver"], [