From b01bd710922eb07a5ef2605ba150d8c752c92b95 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 16 Jul 2015 13:02:03 -0400
Subject: [PATCH] Fix: kvm instrumentation for 4.2 kernels

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 .../events/lttng-module/arch/x86/kvm/mmutrace.h            | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
index bbfce678..165d7d6a 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_KVMMMU_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 kvmmmu
 
-- 
2.34.1