From e18f5d234504092f97d801a9a3f46417fceb0a84 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 13 Apr 2020 16:46:47 -0400
Subject: [PATCH] wrapper: trace-clock: remove kernel version blacklist

---
 blacklist/timekeeping.h | 20 --------------------
 wrapper/trace-clock.h   |  1 -
 2 files changed, 21 deletions(-)
 delete mode 100644 blacklist/timekeeping.h

diff --git a/blacklist/timekeeping.h b/blacklist/timekeeping.h
deleted file mode 100644
index ac8081a3..00000000
--- a/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/wrapper/trace-clock.h b/wrapper/trace-clock.h
index df03c0fc..3a4de825 100644
--- a/wrapper/trace-clock.h
+++ b/wrapper/trace-clock.h
@@ -27,7 +27,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;
 
-- 
2.34.1