From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 6 May 2020 17:38:49 +0000 (-0400)
Subject: Cleanup: Move blacklist/ headers to include/blacklist/
X-Git-Tag: v2.13.0-rc1~224
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=053e573fb9404dd90fc974a6c08baf71eea3bf14;p=lttng-modules.git

Cleanup: Move blacklist/ headers to include/blacklist/

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/blacklist/kprobes.h b/blacklist/kprobes.h
deleted file mode 100644
index 4c52c3d9..00000000
--- a/blacklist/kprobes.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* SPDX-License-Identifier: (GPL-2.0-only OR LGPL-2.1-only)
- *
- * blacklist/kprobes.h
- *
- * Blacklist of kernel for buggy kprobes implementation.
- *
- * Copyright (C) 2019 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
- */
-
-#ifndef _LTTNG_BLACKLIST_KPROBES_H
-#define _LTTNG_BLACKLIST_KPROBES_H
-
-#include <lttng/kernel-version.h>
-
-#if LTTNG_KERNEL_RANGE(4,20,0, 4,20,13) \
-	|| LTTNG_KERNEL_RANGE(4,19,9, 4,19,26) \
-	|| LTTNG_KERNEL_RANGE(4,14,87, 4,14,104)
-# if defined(CONFIG_ARM) && defined(CONFIG_OPTPROBES)
-#  error "Your kernel is known to have buggy optimized kprobes implementation. Fixed by commit 0ac569bf6a7983c0c5747d6df8db9dc05bc92b6c \"ARM: 8834/1: Fix: kprobes: optimized kprobes illegal instruction\" in Linux. Disable CONFIG_OPTPROBES or upgrade your kernel."
-# endif /* #if defined(CONFIG_ARM) && defined(CONFIG_OPTPROBES) */
-#endif
-
-#endif /* _LTTNG_BLACKLIST_KPROBES_H */
diff --git a/blacklist/timekeeping.h b/blacklist/timekeeping.h
deleted file mode 100644
index 96e55d1e..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/include/blacklist/kprobes.h b/include/blacklist/kprobes.h
new file mode 100644
index 00000000..4c52c3d9
--- /dev/null
+++ b/include/blacklist/kprobes.h
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: (GPL-2.0-only OR LGPL-2.1-only)
+ *
+ * blacklist/kprobes.h
+ *
+ * Blacklist of kernel for buggy kprobes implementation.
+ *
+ * Copyright (C) 2019 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
+ */
+
+#ifndef _LTTNG_BLACKLIST_KPROBES_H
+#define _LTTNG_BLACKLIST_KPROBES_H
+
+#include <lttng/kernel-version.h>
+
+#if LTTNG_KERNEL_RANGE(4,20,0, 4,20,13) \
+	|| LTTNG_KERNEL_RANGE(4,19,9, 4,19,26) \
+	|| LTTNG_KERNEL_RANGE(4,14,87, 4,14,104)
+# if defined(CONFIG_ARM) && defined(CONFIG_OPTPROBES)
+#  error "Your kernel is known to have buggy optimized kprobes implementation. Fixed by commit 0ac569bf6a7983c0c5747d6df8db9dc05bc92b6c \"ARM: 8834/1: Fix: kprobes: optimized kprobes illegal instruction\" in Linux. Disable CONFIG_OPTPROBES or upgrade your kernel."
+# endif /* #if defined(CONFIG_ARM) && defined(CONFIG_OPTPROBES) */
+#endif
+
+#endif /* _LTTNG_BLACKLIST_KPROBES_H */
diff --git a/include/blacklist/timekeeping.h b/include/blacklist/timekeeping.h
new file mode 100644
index 00000000..96e55d1e
--- /dev/null
+++ b/include/blacklist/timekeeping.h
@@ -0,0 +1,20 @@
+/* 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 */