Fix: sched for v4.11.5-rt1

[lttng-modules.git] / probes / lttng-probe-kvm-x86.c

diff --git a/probes/lttng-probe-kvm-x86.c b/probes/lttng-probe-kvm-x86.c
index abc93a897c3f6e405bb26d04143906e89ddc4e92..fa3f9dccb08f345ac0e45bf70713e154415f438e 100644 (file)
--- a/probes/lttng-probe-kvm-x86.c
+++ b/probes/lttng-probe-kvm-x86.c
@@ -22,6 +22,14 @@
 
 #include <linux/module.h>
 #include <linux/kvm_host.h>
+#include <lttng-tracer.h>
+#include <lttng-kernel-version.h>
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0))
+#include <kvm/iodev.h>
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)) */
+#include <../../virt/kvm/iodev.h>
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)) */
 
 /*
  * Create the tracepoint static inlines from the kernel to validate that our
@@ -29,7 +37,7 @@
  */
 #include <trace/events/kvm.h>
 
-#include "../wrapper/tracepoint.h"
+#include <wrapper/tracepoint.h>
 
 /*
  * Create LTTng tracepoint probes.
@@ -37,9 +45,13 @@
 #define LTTNG_PACKAGE_BUILD
 #define CREATE_TRACE_POINTS
 
-#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module/arch/x86/kvm
-#include "../instrumentation/events/lttng-module/arch/x86/kvm/trace.h"
+#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module/arch/x86/kvm
+#include <instrumentation/events/lttng-module/arch/x86/kvm/trace.h>
 
 MODULE_LICENSE("GPL and additional rights");
 MODULE_AUTHOR("Mathieu Desnoyers <mathieu.desnoyers@efficios.com>");
 MODULE_DESCRIPTION("LTTng kvm probes");
+MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
+       __stringify(LTTNG_MODULES_MINOR_VERSION) "."
+       __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
+       LTTNG_MODULES_EXTRAVERSION);