ring buffer splice: remove compatibility code

[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 94280ccab0366457156d505c83537d924b1d790e..2eb10ae7e9cf69d24678d89ea21d588dad1d8878 100644 (file)
--- a/probes/lttng-probe-kvm-x86.c
+++ b/probes/lttng-probe-kvm-x86.c
@@ -10,13 +10,11 @@
 #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))
+/* TODO: check for header availability in Makefile */
+#include <../../arch/x86/kvm/kvm_emulate.h>
+
 #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
@@ -24,7 +22,7 @@
  */
 #include <trace/events/kvm.h>
 
-#include <wrapper/tracepoint.h>
+#include "lttng-tracepoint.h"
 
 /*
  * Create LTTng tracepoint probes.