Whamcloud - gitweb
LU-13783 osc: handle removal of NR_UNSTABLE_NFS
[fs/lustre-release.git] / libcfs / autoconf / lustre-libcfs.m4
index 9fd7e10..529b534 100644 (file)
@@ -49,213 +49,6 @@ AS_IF([test "x$enable_panic_dumplog" = xyes],
 ]) # LIBCFS_CONFIG_PANIC_DUMPLOG
 
 #
-# LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK
-#
-# 2.6.32-30.el6 adds a new 'walk_stack' field in 'struct stacktrace_ops'
-#
-AC_DEFUN([LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK], [
-LB_CHECK_COMPILE([if 'struct stacktrace_ops' has 'walk_stack' field],
-stacktrace_ops_walk_stack, [
-       #include <asm/stacktrace.h>
-],[
-       ((struct stacktrace_ops *)0)->walk_stack(NULL, NULL, 0, NULL, NULL, NULL, NULL);
-],[
-       AC_DEFINE(STACKTRACE_OPS_HAVE_WALK_STACK, 1,
-               ['struct stacktrace_ops' has 'walk_stack' field])
-])
-]) # LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK
-
-#
-# LIBCFS_STACKTRACE_WARNING
-#
-# 3.0 removes stacktrace_ops warning* functions
-#
-AC_DEFUN([LIBCFS_STACKTRACE_WARNING], [
-LB_CHECK_COMPILE([if 'stacktrace_ops.warning' is exist],
-stacktrace_ops_warning, [
-       struct task_struct;
-       struct pt_regs;
-       #include <asm/stacktrace.h>
-],[
-       ((struct stacktrace_ops *)0)->warning(NULL, NULL);
-],[
-       AC_DEFINE(HAVE_STACKTRACE_WARNING, 1,
-               [stacktrace_ops.warning is exist])
-])
-]) # LIBCFS_STACKTRACE_WARNING
-
-#
-# LC_SHRINKER_WANT_SHRINK_PTR
-#
-# RHEL6/2.6.32 want to have pointer to shrinker self pointer in handler function
-#
-AC_DEFUN([LC_SHRINKER_WANT_SHRINK_PTR], [
-LB_CHECK_COMPILE([if 'shrinker' want self pointer in handler],
-shrink_self_pointer, [
-       #include <linux/mm.h>
-],[
-       struct shrinker *tmp = NULL;
-       tmp->shrink(tmp, 0, 0);
-],[
-       AC_DEFINE(HAVE_SHRINKER_WANT_SHRINK_PTR, 1,
-               [shrinker want self pointer in handler])
-])
-]) # LC_SHRINKER_WANT_SHRINK_PTR
-
-#
-# LIBCFS_SYSCTL_CTLNAME
-#
-# 2.6.33 no longer has ctl_name & strategy field in struct ctl_table.
-#
-AC_DEFUN([LIBCFS_SYSCTL_CTLNAME], [
-LB_CHECK_COMPILE([if 'ctl_table' has a 'ctl_name' field],
-ctl_table_ctl_name, [
-       #include <linux/sysctl.h>
-],[
-       struct ctl_table ct;
-       ct.ctl_name = sizeof(ct);
-],[
-       AC_DEFINE(HAVE_SYSCTL_CTLNAME, 1,
-               [ctl_table has ctl_name field])
-])
-]) # LIBCFS_SYSCTL_CTLNAME
-
-#
-# LIBCFS_MODULE_LOCKING
-#
-# 2.6.36 introduced locking to module params. RHEL6 lacks this support
-#
-AC_DEFUN([LIBCFS_MODULE_LOCKING],[
-LB_CHECK_COMPILE([does the kernel support module param locking],
-module_param_locking, [
-       #include <linux/moduleparam.h>
-],[
-       __kernel_param_lock(NULL);
-       __kernel_param_unlock(NULL);
-],[
-       AC_DEFINE(HAVE_MODULE_PARAM_LOCKING, 1,
-               [locking module param is supported])
-])
-]) # LIBCFS_MODULE_LOCKING
-
-#
-# LIBCFS_KSTRTOUL
-#
-# 2.6.38 kstrtoul is added
-#
-AC_DEFUN([LIBCFS_KSTRTOUL], [
-LB_CHECK_COMPILE([if Linux kernel has 'kstrtoul'],
-kstrtoul, [
-       #include <linux/kernel.h>
-],[
-       unsigned long result;
-       return kstrtoul("12345", 0, &result);
-],[
-       AC_DEFINE(HAVE_KSTRTOUL, 1,
-               [kernel has kstrtoul])
-])
-]) # LIBCFS_KSTRTOUL
-
-#
-# LIBCFS_DUMP_TRACE_ADDRESS
-#
-# 2.6.39 adds a base pointer address argument to dump_trace
-#
-AC_DEFUN([LIBCFS_DUMP_TRACE_ADDRESS], [
-LB_CHECK_COMPILE([if 'dump_trace' want address],
-dump_trace_address, [
-       struct task_struct;
-       struct pt_regs;
-       #include <asm/stacktrace.h>
-],[
-       dump_trace(NULL, NULL, NULL, 0, NULL, NULL);
-],[
-       AC_DEFINE(HAVE_DUMP_TRACE_ADDRESS, 1,
-               [dump_trace want address argument])
-])
-]) # LIBCFS_DUMP_TRACE_ADDRESS
-
-#
-# LC_SHRINK_CONTROL
-#
-# FC15 2.6.40-5 backported the "shrink_control" parameter to the memory
-# pressure shrinker from Linux 3.0
-#
-AC_DEFUN([LC_SHRINK_CONTROL], [
-LB_CHECK_COMPILE([if 'shrink_control' is present],
-shrink_control, [
-       #include <linux/atomic.h>
-       #include <linux/mm.h>
-],[
-       struct shrink_control tmp = {0};
-       tmp.nr_to_scan = sizeof(tmp);
-],[
-       AC_DEFINE(HAVE_SHRINK_CONTROL, 1,
-               [shrink_control is present])
-])
-]) # LC_SHRINK_CONTROL
-
-#
-# LIBCFS_PROCESS_NAMESPACE
-#
-# 3.5 introduced process namespace
-AC_DEFUN([LIBCFS_PROCESS_NAMESPACE], [
-LB_CHECK_LINUX_HEADER([linux/uidgid.h], [
-       AC_DEFINE(HAVE_UIDGID_HEADER, 1,
-               [uidgid.h is present])])
-]) # LIBCFS_PROCESS_NAMESPACE
-
-#
-# LIBCFS_I_UID_READ
-#
-# 3.5 added helpers to read the new uid/gid types from VFS structures
-# SLE11 SP3 has uidgid.h but not the helpers
-#
-AC_DEFUN([LIBCFS_I_UID_READ], [
-LB_CHECK_COMPILE([if 'i_uid_read' is present],
-i_uid_read, [
-       #include <linux/fs.h>
-],[
-       i_uid_read(NULL);
-],[
-       AC_DEFINE(HAVE_I_UID_READ, 1, [i_uid_read is present])
-])
-]) # LIBCFS_I_UID_READ
-
-#
-# LIBCFS_HAVE_CRC32
-#
-AC_DEFUN([LIBCFS_HAVE_CRC32], [
-LB_CHECK_CONFIG_IM([CRC32],
-       [have_crc32="yes"], [have_crc32="no"])
-AS_IF([test "x$have_crc32" = xyes],
-       [AC_DEFINE(HAVE_CRC32, 1,
-               [kernel compiled with CRC32 functions])])
-]) # LIBCFS_HAVE_CRC32
-
-#
-# LIBCFS_ENABLE_CRC32_ACCEL
-#
-AC_DEFUN([LIBCFS_ENABLE_CRC32_ACCEL], [
-LB_CHECK_CONFIG_IM([CRYPTO_CRC32_PCLMUL],
-       [enable_crc32_crypto="no"], [enable_crc32_crypto="yes"])
-AS_IF([test "x$have_crc32" = xyes -a "x$enable_crc32_crypto" = xyes], [
-       AC_DEFINE(NEED_CRC32_ACCEL, 1, [need pclmulqdq based crc32])
-       AC_MSG_WARN([No crc32 pclmulqdq crypto api found, enable internal pclmulqdq based crc32])])
-]) # LIBCFS_ENABLE_CRC32_ACCEL
-
-#
-# LIBCFS_ENABLE_CRC32C_ACCEL
-#
-AC_DEFUN([LIBCFS_ENABLE_CRC32C_ACCEL], [
-LB_CHECK_CONFIG_IM([CRYPTO_CRC32C_INTEL],
-       [enable_crc32c_crypto="no"], [enable_crc32c_crypto="yes"])
-AS_IF([test "x$enable_crc32c_crypto" = xyes], [
-       AC_DEFINE(NEED_CRC32C_ACCEL, 1, [need pclmulqdq based crc32c])
-       AC_MSG_WARN([No crc32c pclmulqdq crypto api found, enable internal pclmulqdq based crc32c])])
-]) # LIBCFS_ENABLE_CRC32C_ACCEL
-
-#
 # Kernel version 3.11 introduced ktime_get_ts64
 #
 AC_DEFUN([LIBCFS_KTIME_GET_TS64],[
@@ -426,6 +219,26 @@ EXTRA_KCFLAGS="$tmp_flags"
 ]) # LIBCFS_IOV_ITER_HAS_TYPE
 
 #
+# LIBCFS_HAVE_NS_TO_TIMESPEC64
+#
+# Kernel version 4.16-rc3 commit a84d1169164b274f13b97a23ff235c000efe3b49
+# introduced struct __kernel_old_timeval
+#
+AC_DEFUN([LIBCFS_HAVE_NS_TO_TIMESPEC64],[
+LB_CHECK_COMPILE([does 'ns_to_timespec64()' exist],
+kernel_old_timeval, [
+       #include <linux/time.h>
+],[
+       struct timespec64 kts;
+
+       kts = ns_to_timespec64(0);
+],[
+       AC_DEFINE(HAVE_NS_TO_TIMESPEC64, 1,
+               [ns_to_timespec64() is available])
+])
+]) # LIBCFS_HAVE_NS_TO_TIMESPEC64
+
+#
 # Kernel version 3.17 changed hlist_add_after to
 # hlist_add_behind
 #
@@ -658,16 +471,6 @@ topology_sibling_cpumask, [
 ]) # LIBCFS_HAVE_TOPOLOGY_SIBLING_CPUMASK
 
 #
-# Kernel version 4.2 commit df6b35f409af0a8ff1ef62f552b8402f3fef8665
-# header file i387.h was renamed to fpu/api.h
-#
-AC_DEFUN([LIBCFS_FPU_API], [
-LB_CHECK_LINUX_HEADER([asm/fpu/api.h], [
-       AC_DEFINE(HAVE_FPU_API_HEADER, 1,
-               [fpu/api.h is present])])
-]) # LIBCFS_FPU_API
-
-#
 # Kernel version 4.4 commit ef951599074ba4fad2d0efa0a977129b41e6d203
 # introduced kstrtobool and kstrtobool_from_user.
 #
@@ -950,12 +753,33 @@ cpu_hotplug_state_machine, [
 # introduced refcount_t which is atomic_t plus over flow guards.
 #
 AC_DEFUN([LIBCFS_REFCOUNT_T], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
 LB_CHECK_LINUX_HEADER([linux/refcount.h], [
        AC_DEFINE(HAVE_REFCOUNT_T, 1,
-               [refcount_t is supported])])
+               [refcount_t is supported])
+])
+EXTRA_KCFLAGS="$tmp_flags"
 ]) # LIBCFS_REFCOUNT_T
 
 #
+# Kernel version 4.12 commit 499118e966f1d2150bd66647c8932343c4e9a0b8
+# introduce memalloc_noreclaim_{save,restore}
+#
+AC_DEFUN([LIBCFS_MEMALLOC_NORECLAIM], [
+LB_CHECK_COMPILE([if memalloc_noreclaim_{save,restore} exist],
+memalloc_noreclaim, [
+       #include <linux/sched/mm.h>
+],[
+       int flag = memalloc_noreclaim_save();
+       memalloc_noreclaim_restore(flag);
+],[
+       AC_DEFINE(HAVE_MEMALLOC_RECLAIM, 1,
+               [memalloc_noreclaim_{save,restore}() is supported])
+])
+]) # LIBCFS_MEMALLOC_NORECLAIM
+
+#
 # LIBCFS_SCHED_HEADERS
 #
 # 4.11 has broken up sched.h into more headers.
@@ -967,6 +791,22 @@ LB_CHECK_LINUX_HEADER([linux/sched/signal.h], [
 ]) # LIBCFS_SCHED_HEADERS
 
 #
+# Kernel version 4.11-rc1 commit 2c935bc57221cc2edc787c72ea0e2d30cdcd3d5e
+# introduce kref_read
+#
+AC_DEFUN([LIBCFS_KREF_READ], [
+LB_CHECK_COMPILE([if 'kref_read' exists],
+kref_read, [
+       #include <linux/kref.h>
+],[
+       kref_read(NULL);
+],[
+       AC_DEFINE(HAVE_KREF_READ, 1,
+               [kref_read() is available])
+])
+]) LIBCFS_KREF_READ
+
+#
 # Kernel version 4.11-rc1 commit da20420f83ea0fbcf3d03afda08d971ea1d8a356
 # introduced rht_bucket_var
 #
@@ -1003,6 +843,22 @@ rhashtable_lookup_get_insert_fast, [
 ]) # LIBCFS_RHASHTABLE_LOOKUP_GET_INSERT_FAST
 
 #
+# Kernel version 4.12-rc2 8f553c498e1772cccb39a114da4a498d22992758
+# provide proper CPU hotplug locking
+#
+AC_DEFUN([LIBCFS_CPUS_READ_LOCK], [
+LB_CHECK_COMPILE([if 'cpus_read_[un]lock' exist],
+cpu_read_lock, [
+       #include <linux/cpu.h>
+],[
+       cpus_read_lock();
+       cpus_read_unlock();
+],[
+       AC_DEFINE(HAVE_CPUS_READ_LOCK, 1, ['cpus_read_lock' exist])
+])
+]) # LIBCFS_CPUS_READ_LOCK
+
+#
 # Kernel version 4.12-rc3 f9727a17db9bab71ddae91f74f11a8a2f9a0ece6
 # renamed uuid_be to uuid_t
 #
@@ -1024,9 +880,13 @@ uuid_t, [
 # introduce processor.h
 #
 AC_DEFUN([LIBCFS_HAVE_PROCESSOR_HEADER], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
 LB_CHECK_LINUX_HEADER([linux/processor.h], [
        AC_DEFINE(HAVE_PROCESSOR_H, 1,
-               [processor.h is present])])
+               [processor.h is present])
+])
+EXTRA_KCFLAGS="$tmp_flags"
 ]) # LIBCFS_HAVE_PROCESSOR_HEADER
 
 #
@@ -1185,6 +1045,31 @@ LB_CHECK_EXPORT([save_stack_trace_tsk], [arch/$SUBARCH/kernel/stacktrace.c],
 ]) # LIBCFS_EXPORT_SAVE_STACK_TRACE_TSK
 
 #
+# LIBCFS_LOCKDEP_IS_HELD
+#
+# Kernel v4.15-rc8-106-g08f36ff64234
+# lockdep: Make lockdep checking constant
+#
+AC_DEFUN([LIBCFS_LOCKDEP_IS_HELD], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if 'lockdep_is_held()' uses const argument],
+lockdep_is_held, [
+       #include <linux/lockdep.h>
+],[
+#ifdef CONFIG_LOCKDEP
+       const struct spinlock *lock = NULL;
+
+       lockdep_is_held(lock);
+#endif
+],[],[
+       AC_DEFINE(NEED_LOCKDEP_IS_HELD_DISCARD_CONST, 1,
+               [lockdep_is_held() argument is const])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LIBCFS_LOCKDEP_IS_HELD
+
+#
 # LIBCFS_TIMER_SETUP
 #
 # Kernel version 4.15 commit e99e88a9d2b067465adaa9c111ada99a041bef9a
@@ -1225,6 +1110,24 @@ wait_var_event, [
 ]) # LIBCFS_WAIT_VAR_EVENT
 
 #
+# LIBCFS_BITMAP_ALLOC
+#
+# Kernel version 4.17 commit c42b65e363ce97a828f81b59033c3558f8fa7f70
+# added bitmap memory allocation handling.
+#
+AC_DEFUN([LIBCFS_BITMAP_ALLOC], [
+LB_CHECK_COMPILE([if Linux bitmap memory management exist],
+bitmap_alloc, [
+       #include <linux/bitmap.h>
+],[
+       unsigned long *map = bitmap_alloc(1, GFP_KERNEL);
+],[
+       AC_DEFINE(HAVE_BITMAP_ALLOC, 1,
+               [Linux bitmap can be allocated])
+])
+]) # LIBCFS_BITMAP_ALLOC
+
+#
 # LIBCFS_CLEAR_AND_WAKE_UP_BIT
 #
 # Kernel version 4.17-rc2 commit 8236b0ae31c837d2b3a2565c5f8d77f637e824cc
@@ -1246,6 +1149,28 @@ clear_and_wake_up_bit, [
 ]) # LIBCFS_CLEAR_AND_WAKE_UP_BIT
 
 #
+# LIBCFS_XARRAY_SUPPORT
+#
+# 4.19-rc5 kernel commit 3159f943aafdbacb2f94c38fdaadabf2bbde2a14
+# replaced the radix tree implementation with Xarrays. This change
+# introduced functionaly needed for general Xarray support
+#
+AC_DEFUN([LIBCFS_XARRAY_SUPPORT], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if page cache uses Xarray],
+xarray_support, [
+       #include <linux/xarray.h>
+],[
+       xa_is_value(NULL);
+],[
+       AC_DEFINE(HAVE_XARRAY_SUPPORT, 1,
+               [kernel Xarray implementation lacks 'xa_is_value'])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LIBCFS_XARRAY_SUPPORT
+
+#
 # LIBCFS_HAVE_IOV_ITER_TYPE
 #
 # kernel 4.20 commit 00e23707442a75b404392cef1405ab4fd498de6b
@@ -1269,6 +1194,58 @@ EXTRA_KCFLAGS="$tmp_flags"
 ]) # LIBCFS_HAVE_IOV_ITER_TYPE
 
 #
+# LIBCFS_GET_REQUEST_KEY_AUTH
+#
+# kernel 5.0 commit 822ad64d7e46a8e2c8b8a796738d7b657cbb146d
+# keys: Fix dependency loop between construction record and auth key
+#
+# Added <keys/request_key_auth-type.h> and get_request_key_auth()
+# which was propagated to stable
+#
+AC_DEFUN([LIBCFS_GET_REQUEST_KEY_AUTH], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if get_request_key_auth() is available],
+get_request_key_auth_exported, [
+       #include <linux/key.h>
+       #include <linux/keyctl.h>
+       #include <keys/request_key_auth-type.h>
+],[
+       struct key *ring;
+       const struct key *key = NULL;
+       struct request_key_auth *rka = get_request_key_auth(key);
+
+       ring = key_get(rka->dest_keyring);
+],[
+       AC_DEFINE(HAVE_GET_REQUEST_KEY_AUTH, 1,
+               [get_request_key_auth() is available])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LIBCFS_GET_REQUEST_KEY_AUTH
+
+#
+# LIBCFS_LOOKUP_USER_KEY
+#
+# kernel 5.3 commit 3cf5d076fb4d48979f382bc9452765bf8b79e740
+# signal: Remove task parameter from force_sig
+#
+AC_DEFUN([LIBCFS_LOOKUP_USER_KEY], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if lookup_user_key() is available],
+lookup_user_key_exported, [
+       #include <linux/key.h>
+       #include <linux/keyctl.h>
+],[
+       lookup_user_key(KEY_SPEC_USER_KEYRING, 0, 0);
+],[
+       AC_DEFINE(HAVE_LOOKUP_USER_KEY, 1,
+               [lookup_user_key() is available])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LIBCFS_LOOKUP_USER_KEY
+
+#
 # LIBCFS_FORCE_SIG_WITH_TASK
 #
 # kernel 5.3 commit 3cf5d076fb4d48979f382bc9452765bf8b79e740
@@ -1290,6 +1267,55 @@ EXTRA_KCFLAGS="$tmp_flags"
 ]) # LIBCFS_FORCE_SIG_WITH_TASK
 
 #
+# LIBCFS_CACHE_DETAIL_WRITERS
+#
+# kernel v5.3-rc2-1-g64a38e840ce5
+# SUNRPC: Track writers of the 'channel' file to improve cache_listeners_exist
+#
+AC_DEFUN([LIBCFS_CACHE_DETAIL_WRITERS], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if struct cache_detail has writers],
+cache_detail_writers_atomic, [
+       #include <linux/sunrpc/cache.h>
+
+       static struct cache_detail rsi_cache;
+],[
+       atomic_set(&rsi_cache.writers, 0);
+],[
+       AC_DEFINE(HAVE_CACHE_DETAIL_WRITERS, 1,
+               [struct cache_detail has writers])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LIBCFS_CACHE_DETAIL_WRITERS
+
+#
+# LIBCFS_HAVE_NR_UNSTABLE_NFS
+#
+# kernel v5.8-rc1~201^2~75
+# mm/writeback: discard NR_UNSTABLE_NFS, use NR_WRITEBACK instead
+#
+AC_DEFUN([LIBCFS_HAVE_NR_UNSTABLE_NFS], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if NR_UNSTABLE_NFS still in use],
+nr_unstable_nfs_exists, [
+       #include <linux/mm.h>
+
+       int i;
+],[
+       i = NR_UNSTABLE_NFS;
+],[
+       AC_DEFINE(HAVE_NR_UNSTABLE_NFS, 1,
+               [NR_UNSTABLE_NFS is still in use.])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LIBCFS_HAVE_NR_UNSTABLE_NFS
+
+AC_DEFUN([LIBCFS_PROG_LINUX_SRC], [] )
+AC_DEFUN([LIBCFS_PROG_LINUX_RESULTS], [])
+
+#
 # LIBCFS_PROG_LINUX
 #
 # LibCFS linux kernel checks
@@ -1299,29 +1325,6 @@ AC_MSG_NOTICE([LibCFS kernel checks
 ==============================================================================])
 LIBCFS_CONFIG_PANIC_DUMPLOG
 
-# 2.6.32
-LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK
-LC_SHRINKER_WANT_SHRINK_PTR
-# 2.6.33
-LIBCFS_SYSCTL_CTLNAME
-# 2.6.36
-LIBCFS_MODULE_LOCKING
-# 2.6.38
-LIBCFS_KSTRTOUL
-# 2.6.39
-LIBCFS_DUMP_TRACE_ADDRESS
-# 2.6.40 fc15
-LC_SHRINK_CONTROL
-# 3.0
-LIBCFS_STACKTRACE_WARNING
-# 3.5
-LIBCFS_PROCESS_NAMESPACE
-LIBCFS_I_UID_READ
-# 3.8
-LIBCFS_HAVE_CRC32
-LIBCFS_ENABLE_CRC32_ACCEL
-# 3.10
-LIBCFS_ENABLE_CRC32C_ACCEL
 # 3.11
 LIBCFS_KTIME_GET_TS64
 # 3.12
@@ -1334,6 +1337,8 @@ LIBCFS_KTIME_COMPARE
 LIBCFS_SHRINKER_COUNT
 # 3.15
 LIBCFS_IOV_ITER_HAS_TYPE
+# 3.16
+LIBCFS_HAVE_NS_TO_TIMESPEC64
 # 3.17
 LIBCFS_HLIST_ADD_AFTER
 LIBCFS_TIMESPEC64
@@ -1352,7 +1357,6 @@ LIBCFS_KTIME_MS_DELTA
 LIBCFS_KERNEL_PARAM_LOCK
 # 4.2
 LIBCFS_HAVE_TOPOLOGY_SIBLING_CPUMASK
-LIBCFS_FPU_API
 # 4.4
 LIBCFS_KSTRTOBOOL_FROM_USER
 # 4.5
@@ -1380,11 +1384,14 @@ LIBCFS_REFCOUNT_T
 # 4.11
 LIBCFS_RHASHTABLE_LOOKUP_GET_INSERT_FAST
 LIBCFS_SCHED_HEADERS
+LIBCFS_KREF_READ
 LIBCFS_RHT_BUCKET_VAR
 # 4.12
 LIBCFS_HAVE_PROCESSOR_HEADER
 LIBCFS_HAVE_WAIT_BIT_HEADER
+LIBCFS_MEMALLOC_NORECLAIM
 LIBCFS_WAIT_QUEUE_TASK_LIST_RENAME
+LIBCFS_CPUS_READ_LOCK
 LIBCFS_UUID_T
 # 4.13
 LIBCFS_WAIT_QUEUE_ENTRY
@@ -1394,17 +1401,25 @@ LIBCFS_NEW_KERNEL_WRITE
 LIBCFS_NEW_KERNEL_READ
 LIBCFS_EXPORT_SAVE_STACK_TRACE_TSK
 # 4.15
+LIBCFS_LOCKDEP_IS_HELD
 LIBCFS_TIMER_SETUP
 # 4.16
 LIBCFS_WAIT_VAR_EVENT
 # 4.17
+LIBCFS_BITMAP_ALLOC
 LIBCFS_CLEAR_AND_WAKE_UP_BIT
+# 4.19
+LIBCFS_XARRAY_SUPPORT
 # 4.20
 LIBCFS_HAVE_IOV_ITER_TYPE
 # 5.0
 LIBCFS_MM_TOTALRAM_PAGES_FUNC
+LIBCFS_GET_REQUEST_KEY_AUTH
 # 5.3
+LIBCFS_LOOKUP_USER_KEY
 LIBCFS_FORCE_SIG_WITH_TASK
+LIBCFS_CACHE_DETAIL_WRITERS
+LIBCFS_HAVE_NR_UNSTABLE_NFS
 ]) # LIBCFS_PROG_LINUX
 
 #
@@ -1471,15 +1486,6 @@ AC_SUBST(PTHREAD_LIBS)
 ]) # LIBCFS_CONFIGURE
 
 #
-# LIBCFS_CONDITIONALS
-#
-AC_DEFUN([LIBCFS_CONDITIONALS], [
-AM_CONDITIONAL(HAVE_CRC32, [test "x$have_crc32" = xyes])
-AM_CONDITIONAL(NEED_PCLMULQDQ_CRC32,  [test "x$have_crc32" = xyes -a "x$enable_crc32_crypto" = xyes])
-AM_CONDITIONAL(NEED_PCLMULQDQ_CRC32C, [test "x$enable_crc32c_crypto" = xyes])
-]) # LIBCFS_CONDITIONALS
-
-#
 # LIBCFS_CONFIG_FILES
 #
 # files that should be generated with AC_OUTPUT
@@ -1491,11 +1497,15 @@ libcfs/autoMakefile
 libcfs/autoconf/Makefile
 libcfs/include/Makefile
 libcfs/include/libcfs/Makefile
+libcfs/include/uapi/Makefile
 libcfs/include/libcfs/linux/Makefile
 libcfs/include/libcfs/util/Makefile
+libcfs/include/libcfs/crypto/Makefile
+libcfs/include/uapi/linux/Makefile
 libcfs/libcfs/Makefile
 libcfs/libcfs/autoMakefile
 libcfs/libcfs/linux/Makefile
 libcfs/libcfs/util/Makefile
+libcfs/libcfs/crypto/Makefile
 ])
 ]) # LIBCFS_CONFIG_FILES