From: Mathieu Desnoyers Date: Mon, 13 Apr 2020 20:46:47 +0000 (-0400) Subject: wrapper: trace-clock: remove kernel version blacklist X-Git-Tag: for-upstreaming-review-1~35 X-Git-Url: http://git.liburcu.org/?p=lttng-modules.git;a=commitdiff_plain;h=e18f5d234504092f97d801a9a3f46417fceb0a84 wrapper: trace-clock: remove kernel version blacklist --- 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 - */ - -#ifndef _LTTNG_BLACKLIST_TIMEKEEPING_H -#define _LTTNG_BLACKLIST_TIMEKEEPING_H - -#include - -#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 #include #include -#include extern struct lttng_trace_clock *lttng_trace_clock;