Use system include path in wrappers

[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 6bf6beeb36aa23f995eb482157803f97729fecf5..f0c7381b5b2dec3c5e111a112b0afe10f59f7ce7 100644 (file)
--- 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
 
@@ -142,7 +147,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(
        TP_ARGS(sptep, gfn, access, gen),
 
        TP_FIELDS(
-               ctf_integer(void *, sptep, sptep)
+               ctf_integer_hex(void *, sptep, sptep)
                ctf_integer(gfn_t, gfn, gfn)
                ctf_integer(unsigned, access, access)
                ctf_integer(unsigned int, gen, gen)
@@ -160,7 +165,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(
        TP_ARGS(sptep, gfn, access),
 
        TP_FIELDS(
-               ctf_integer(void *, sptep, sptep)
+               ctf_integer_hex(void *, sptep, sptep)
                ctf_integer(gfn_t, gfn, gfn)
                ctf_integer(unsigned, access, access)
        )
@@ -196,7 +201,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(
                ctf_integer(int, vcpu_id, vcpu->vcpu_id)
                ctf_integer(gva_t, gva, gva)
                ctf_integer(u32, error_code, error_code)
-               ctf_integer(u64 *, sptep, sptep)
+               ctf_integer_hex(u64 *, sptep, sptep)
                ctf_integer(u64, old_spte, old_spte)
                ctf_integer(u64, new_spte, *sptep)
                ctf_integer(bool, retry, retry)