Cleanup: Move headers from probes/ to include/lttng/

[lttng-modules.git] / instrumentation / events / lttng-module / arch / x86 / kvm / mmutrace.h

diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
index 46b46c362be75c4140dfca129bd5938c1d5ee29f..1195ded72bfa7ff95f6634329dfa41895df2ad0a 100644 (file)
--- a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
+++ b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
@@ -1,8 +1,8 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 #if !defined(LTTNG_TRACE_KVM_MMU_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_KVM_MMU_H
 
-#include <probes/lttng-tracepoint-event.h>
+#include <lttng/tracepoint-event.h>
 #include <linux/version.h>
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0))
@@ -14,7 +14,8 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM kvm_mmu
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0) || \
+       LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0))
 
 #define LTTNG_KVM_MMU_PAGE_FIELDS \
        ctf_integer(__u64, gfn, (sp)->gfn) \
@@ -217,7 +218,10 @@ LTTNG_TRACEPOINT_EVENT_MAP(
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) || \
        LTTNG_KERNEL_RANGE(4,19,103, 4,20,0) || \
        LTTNG_KERNEL_RANGE(5,4,19, 5,5,0) || \
-       LTTNG_KERNEL_RANGE(5,5,3, 5,6,0))
+       LTTNG_KERNEL_RANGE(5,5,3, 5,6,0) || \
+       LTTNG_UBUNTU_KERNEL_RANGE(4,15,18,92, 4,16,0,0) || \
+       LTTNG_UBUNTU_KERNEL_RANGE(5,3,18,43, 5,3,18,45) || \
+       LTTNG_UBUNTU_KERNEL_RANGE(5,3,18,46, 5,4,0,0))
 LTTNG_TRACEPOINT_EVENT_MAP(
        fast_page_fault,
 
@@ -267,4 +271,4 @@ LTTNG_TRACEPOINT_EVENT_MAP(
 #define TRACE_INCLUDE_FILE mmutrace
 
 /* This part must be outside protection */
-#include <probes/define_trace.h>
+#include <lttng/define_trace.h>