X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Fautoconf%2Flustre-libcfs.m4;h=db240c218a32817d2ee2a4af00208a5d8cd4cd19;hb=beb733c0f27c28d699700a5aabec41bf573712f8;hp=b55979865d1abd8122260c580e00b645c3e861e3;hpb=fb436c078ddb95f2371d93a37e4f67a31701add2;p=fs%2Flustre-release.git

diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4
index b559798..db240c21 100644
--- a/libcfs/autoconf/lustre-libcfs.m4
+++ b/libcfs/autoconf/lustre-libcfs.m4
@@ -262,6 +262,60 @@ AS_IF([test "x$enable_crc32c_crypto" = xyes], [
 ]) # LIBCFS_ENABLE_CRC32C_ACCEL
 
 #
+# Kernel version 3.11 introduced ktime_get_ts64
+#
+AC_DEFUN([LIBCFS_KTIME_GET_TS64],[
+LB_CHECK_COMPILE([does function 'ktime_get_ts64' exist],
+ktime_get_ts64, [
+	#include <linux/ktime.h>
+],[
+	struct timespec64 *ts = NULL;
+
+	ktime_get_ts64(ts);
+],[
+	AC_DEFINE(HAVE_KTIME_GET_TS64, 1,
+		['ktime_get_ts64' is available])
+])
+]) # LIBCFS_KTIME_GET_TS64
+
+#
+# Kernel version 3.12 introduced ktime_add
+#
+AC_DEFUN([LIBCFS_KTIME_ADD],[
+LB_CHECK_COMPILE([does function 'ktime_add' exist],
+ktime_add, [
+	#include <linux/ktime.h>
+],[
+	ktime_t start = ktime_set(0, 0);
+	ktime_t end = start;
+	ktime_t total;
+
+	total = ktime_add(start, end);
+],[
+	AC_DEFINE(HAVE_KTIME_ADD, 1,
+		[ktime_add is available])
+])
+]) # LIBCFS_KTIME_ADD
+
+#
+# Kernel version 3.12 introduced ktime_after
+#
+AC_DEFUN([LIBCFS_KTIME_AFTER],[
+LB_CHECK_COMPILE([does function 'ktime_after' exist],
+ktime_after, [
+	#include <linux/ktime.h>
+],[
+	ktime_t start = ktime_set(0, 0);
+	ktime_t end = start;
+
+	ktime_after(start, end);
+],[
+	AC_DEFINE(HAVE_KTIME_AFTER, 1,
+		[ktime_after is available])
+])
+]) # LIBCFS_KTIME_AFTER
+
+#
 # FC19 3.12 kernel struct shrinker change
 #
 AC_DEFUN([LIBCFS_SHRINKER_COUNT],[
@@ -294,6 +348,110 @@ hlist_add_after, [
 ]) # LIBCFS_HLIST_ADD_AFTER
 
 #
+# Kernel version 3.17 introduced struct timespec64
+#
+AC_DEFUN([LIBCFS_TIMESPEC64],[
+LB_CHECK_COMPILE([does 'struct timespec64' exist],
+timespec64, [
+	#include <linux/time.h>
+],[
+	struct timespec64 ts;
+
+	ts.tv_sec = 0;
+	ts.tv_nsec = 0;
+],[
+	AC_DEFINE(HAVE_TIMESPEC64, 1,
+		['struct timespec64' is available])
+])
+]) # LIBCFS_TIMESPEC64
+
+#
+# Kernel version 3.17 introduced ktime_get_real_ts64
+#
+AC_DEFUN([LIBCFS_KTIME_GET_REAL_TS64],[
+LB_CHECK_COMPILE([does function 'ktime_get_real_ts64' exist],
+ktime_get_real_ts64, [
+	#include <linux/ktime.h>
+],[
+	struct timespec64 *ts = NULL;
+
+	ktime_get_real_ts64(ts);
+],[
+	AC_DEFINE(HAVE_KTIME_GET_REAL_TS64, 1,
+		['ktime_get_real_ts64' is available])
+])
+]) # LIBCFS_KTIME_GET_REAL_TS64
+
+#
+# Kernel version 3.17 introduced ktime_get_real_seconds
+#
+AC_DEFUN([LIBCFS_KTIME_GET_REAL_SECONDS],[
+LB_CHECK_COMPILE([does function 'ktime_get_real_seconds' exist],
+ktime_get_real_seconds, [
+	#include <linux/ktime.h>
+],[
+	time64_t now;
+
+	now = ktime_get_real_seconds();
+],[
+	AC_DEFINE(HAVE_KTIME_GET_REAL_SECONDS, 1,
+		['ktime_get_real_seconds' is available])
+])
+]) # LIBCFS_KTIME_GET_REAL_SECONDS
+
+#
+# Kernel version 3.17 created ktime_get_real_ns wrapper
+#
+AC_DEFUN([LIBCFS_KTIME_GET_REAL_NS],[
+LB_CHECK_COMPILE([does function 'ktime_get_real_ns' exist],
+ktime_get_real_ns, [
+	#include <linux/ktime.h>
+],[
+	u64 nanoseconds;
+
+	nanoseconds = ktime_get_real_ns();
+],[],[
+	AC_DEFINE(NEED_KTIME_GET_REAL_NS, 1,
+		['ktime_get_real_ns' is not available])
+])
+]) # LIBCFS_KTIME_GET_REAL_NS
+
+#
+# Kernel version 3.17 introduced ktime_to_timespec64
+#
+AC_DEFUN([LIBCFS_KTIME_TO_TIMESPEC64],[
+LB_CHECK_COMPILE([does function 'ktime_to_timespec64' exist],
+ktime_to_timespec64, [
+	#include <linux/ktime.h>
+],[
+	struct timespec64 ts;
+	ktime_t now;
+
+	ts = ktime_to_timespec64(now);
+],[
+	AC_DEFINE(HAVE_KTIME_TO_TIMESPEC64, 1,
+		['ktime_to_timespec64' is available])
+])
+]) # LIBCFS_KTIME_TO_TIMESPEC64
+
+#
+# Kernel version 3.19 introduced ktime_get_seconds
+#
+AC_DEFUN([LIBCFS_KTIME_GET_SECONDS],[
+LB_CHECK_COMPILE([does function 'ktime_get_seconds' exist],
+ktime_get_seconds, [
+	#include <linux/ktime.h>
+],[
+	time64_t now;
+
+	now = ktime_get_seconds();
+],[
+	AC_DEFINE(HAVE_KTIME_GET_SECONDS, 1,
+		['ktime_get_seconds' is available])
+])
+]) # LIBCFS_KTIME_GET_SECONDS
+
+#
 # Kernel version 4.2 changed topology_thread_cpumask
 # to topology_sibling_cpumask
 #
@@ -358,6 +516,62 @@ stacktrace_ops_address_return_int, [
 ]) # LIBCFS_STACKTRACE_OPS_ADDRESS_RETURN_INT
 
 #
+# Kernel version 4.6 removed both struct task_struct and struct mm_struct
+# arguments to get_user_pages
+#
+AC_DEFUN([LIBCFS_GET_USER_PAGES_6ARG], [
+LB_CHECK_COMPILE([if 'get_user_pages()' takes 6 arguments],
+get_user_pages_6arg, [
+	#include <linux/mm.h>
+],[
+	int rc;
+
+	rc = get_user_pages(0, 0, 0, 0, NULL, NULL);
+],[
+	AC_DEFINE(HAVE_GET_USER_PAGES_6ARG, 1,
+		[get_user_pages takes 6 arguments])
+])
+]) # LIBCFS_GET_USER_PAGES_6ARG
+
+#
+# LIBCFS_STACKTRACE_OPS
+#
+# Kernel version 4.8 commit c8fe4609827aedc9c4b45de80e7cdc8ccfa8541b
+# removed both struct stacktrace_ops and dump_trace() function
+#
+AC_DEFUN([LIBCFS_STACKTRACE_OPS], [
+LB_CHECK_COMPILE([if 'struct stacktrace_ops' exists],
+stacktrace_ops, [
+	struct task_struct;
+	struct pt_regs;
+	#include <asm/stacktrace.h>
+],[
+	struct stacktrace_ops ops;
+	ops.stack = NULL;
+],[
+	AC_DEFINE(HAVE_STACKTRACE_OPS, 1,
+		[struct stacktrace_ops exists])
+])
+]) # LIBCFS_STACKTRACE_OPS
+
+#
+# Kernel version 4.9 commit 768ae309a96103ed02eb1e111e838c87854d8b51
+# mm: replace get_user_pages() write/force parameters with gup_flags
+#
+AC_DEFUN([LIBCFS_GET_USER_PAGES_GUP_FLAGS], [
+LB_CHECK_COMPILE([if 'get_user_pages()' takes gup_flags in arguments],
+get_user_pages_gup_flags, [
+	#include <linux/mm.h>
+],[
+	int rc;
+	rc = get_user_pages(0, 0, FOLL_WRITE, NULL, NULL);
+],[
+	AC_DEFINE(HAVE_GET_USER_PAGES_GUP_FLAGS, 1,
+		[get_user_pages takes gup_flags in arguments])
+])
+]) # LIBCFS_GET_USER_PAGES_GUP_FLAGS
+
+#
 # LIBCFS_PROG_LINUX
 #
 # LibCFS linux kernel checks
@@ -390,10 +604,21 @@ LIBCFS_HAVE_CRC32
 LIBCFS_ENABLE_CRC32_ACCEL
 # 3.10
 LIBCFS_ENABLE_CRC32C_ACCEL
+# 3.11
+LIBCFS_KTIME_GET_TS64
 # 3.12
+LIBCFS_KTIME_ADD
+LIBCFS_KTIME_AFTER
 LIBCFS_SHRINKER_COUNT
 # 3.17
 LIBCFS_HLIST_ADD_AFTER
+LIBCFS_TIMESPEC64
+LIBCFS_KTIME_GET_REAL_TS64
+LIBCFS_KTIME_GET_REAL_SECONDS
+LIBCFS_KTIME_GET_REAL_NS
+LIBCFS_KTIME_TO_TIMESPEC64
+# 3.19
+LIBCFS_KTIME_GET_SECONDS
 # 4.2
 LIBCFS_HAVE_TOPOLOGY_SIBLING_CPUMASK
 LIBCFS_FPU_API
@@ -401,6 +626,11 @@ LIBCFS_FPU_API
 LIBCFS_CRYPTO_HASH_HELPERS
 # 4.6
 LIBCFS_STACKTRACE_OPS_ADDRESS_RETURN_INT
+LIBCFS_GET_USER_PAGES_6ARG
+# 4.8
+LIBCFS_STACKTRACE_OPS
+# 4.9
+LIBCFS_GET_USER_PAGES_GUP_FLAGS
 ]) # LIBCFS_PROG_LINUX
 
 #