X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=wrapper%2Ftime.h;h=60ce78c9f32e65b83160a29d93ceee97089dae25;hb=b7cdc18250880cc44edeef4a4b42c8ac7a135a6d;hp=527615af71f2af0cc4259fcaedec66c0e150d1a3;hpb=9f36eaed6f91d5897924b551b44d1edd8cee00e2;p=lttng-modules.git

diff --git a/wrapper/time.h b/wrapper/time.h
index 527615af..60ce78c9 100644
--- a/wrapper/time.h
+++ b/wrapper/time.h
@@ -1,30 +1,22 @@
-/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
  *
  * wrapper/time.h
  *
- * Copyright (C) 2015 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2020 Michael Jeanson <mjeanson@efficios.com>
+ * Copyright (C) 2020 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
 #ifndef _LTTNG_WRAPPER_TIME_H
 #define _LTTNG_WRAPPER_TIME_H
 
 #include <linux/version.h>
-#include <linux/time.h>
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
-
-static inline bool lttng_close_on_exec(int fd, const struct fdtable *fdt)
-{
-	return close_on_exec(fd, fdt);
-}
-
-#else
-
-static inline bool lttng_close_on_exec(int fd, const struct fdtable *fdt)
-{
-	return FD_ISSET(fd, fdt->close_on_exec);
-}
 
+/*
+ * Use 64bit timespec on kernels that have it, this makes 32bit arch
+ * y2038 compliant.
+ */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0))
+# define LTTNG_KERNEL_HAS_TIMESPEC64
 #endif
 
 #endif /* _LTTNG_WRAPPER_TIME_H */