Drop support for kernels < 4.4 from 'wrapper/trace-clock.h'

Change-Id: I252af5b4e7948e4798ad9f70a57ac42a62d506ef
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/blacklist/timekeeping.h b/include/blacklist/timekeeping.h
deleted file mode 100644 (file)
index 96e55d1..0000000
--- a/include/blacklist/timekeeping.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* SPDX-License-Identifier: (GPL-2.0-only OR LGPL-2.1-only)
- *
- * blacklist/timekeeping.h
- *
- * Blacklist of kernel for buggy timekeeping implementation.
- *
- * Copyright (C) 2019 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
- */
-
-#ifndef _LTTNG_BLACKLIST_TIMEKEEPING_H
-#define _LTTNG_BLACKLIST_TIMEKEEPING_H
-
-#include <lttng/kernel-version.h>
-
-#if ((LTTNG_KERNEL_RANGE(3,10,0, 3,10,14) && !LTTNG_RHEL_KERNEL_RANGE(3,10,0,123,0,0, 3,10,14,0,0,0)) \
-       || LTTNG_KERNEL_RANGE(3,11,0, 3,11,3))
-# error "Linux kernels 3.10 and 3.11 introduce a deadlock in the timekeeping subsystem. Fixed by commit 7bd36014460f793c19e7d6c94dab67b0afcfcb7f \"timekeeping: Fix HRTICK related deadlock from ntp lock changes\" in Linux."
-#endif
-
-#endif /* _LTTNG_BLACKLIST_TIMEKEEPING_H */

diff --git a/include/wrapper/trace-clock.h b/include/wrapper/trace-clock.h
index 69dcc8003790a5ca9bb1486955237e20971cab35..adb1101f2d0c8c6836fe1e9fc63de9dd7552fec2 100644 (file)
--- a/include/wrapper/trace-clock.h
+++ b/include/wrapper/trace-clock.h
@@ -28,7 +28,6 @@
 #include <lttng/clock.h>
 #include <wrapper/compiler.h>
 #include <wrapper/random.h>
-#include <blacklist/timekeeping.h>
 
 extern struct lttng_trace_clock *lttng_trace_clock;
 
@@ -39,8 +38,7 @@ extern struct lttng_trace_clock *lttng_trace_clock;
  */
 #if (LTTNG_KERNEL_RANGE(4,8,0, 4,8,2) \
        || LTTNG_KERNEL_RANGE(4,7,4, 4,7,8) \
-       || LTTNG_KERNEL_RANGE(4,4,20, 4,4,25) \
-       || LTTNG_KERNEL_RANGE(4,1,32, 4,1,35))
+       || LTTNG_KERNEL_RANGE(4,4,20, 4,4,25))
 #define LTTNG_CLOCK_NMI_SAFE_BROKEN
 #endif
 
@@ -52,9 +50,7 @@ extern struct lttng_trace_clock *lttng_trace_clock;
  * this feature on 64-bit architectures.
  */
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,17,0) \
-       && BITS_PER_LONG == 64 \
-       && !defined(LTTNG_CLOCK_NMI_SAFE_BROKEN))
+#if (BITS_PER_LONG == 64 && !defined(LTTNG_CLOCK_NMI_SAFE_BROKEN))
 #define LTTNG_USE_NMI_SAFE_CLOCK
 #endif