From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 16 Jul 2015 17:02:03 +0000 (-0400)
Subject: Fix: kvm instrumentation for 4.2 kernels
X-Git-Tag: v2.7.0-rc2~16
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=22e3d16634259c15794fb4516727667d8b749cad;p=lttng-modules.git

Fix: kvm instrumentation for 4.2 kernels

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

diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
index 6bf6beeb..65dabde9 100644
--- a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
+++ b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
@@ -2,9 +2,14 @@
 #define LTTNG_TRACE_KVM_MMU_H
 
 #include "../../../../../../probes/lttng-tracepoint-event.h"
-#include <linux/ftrace_event.h>
 #include <linux/version.h>
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0))
+#include <linux/trace_events.h>
+#else /* if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) */
+#include <linux/ftrace_event.h>
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) */
+
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM kvm_mmu