Fix: add RHEL version macros

[lttng-modules.git] / instrumentation / events / lttng-module / kvm.h

diff --git a/instrumentation/events/lttng-module/kvm.h b/instrumentation/events/lttng-module/kvm.h
old mode 100755 (executable)
new mode 100644 (file)
index 3a6585f..87d605c
--- a/instrumentation/events/lttng-module/kvm.h
+++ b/instrumentation/events/lttng-module/kvm.h
@@ -117,24 +117,13 @@ LTTNG_TRACEPOINT_EVENT(kvm_age_page,
        TP_PROTO(ulong gfn, int level, struct kvm_memory_slot *slot, int ref),
        TP_ARGS(gfn, level, slot, ref),
 
-       TP_STRUCT__entry(
-               __field(        u64,    hva             )
-               __field(        u64,    gfn             )
-               __field(        u8,     level           )
-               __field(        u8,     referenced      )
-       ),
-
-       TP_fast_assign(
-               tp_assign(gfn, gfn)
-               tp_assign(level, level)
-               tp_assign(hva, ((gfn - slot->base_gfn) <<
-                       PAGE_SHIFT) + slot->userspace_addr)
-               tp_assign(referenced, ref)
-       ),
-
-       TP_printk("hva %llx gfn %llx level %u %s",
-               __entry->hva, __entry->gfn, __entry->level,
-               __entry->referenced ? "YOUNG" : "OLD")
+       TP_FIELDS(
+               ctf_integer(u64, hva,
+                       ((gfn - slot->base_gfn) << PAGE_SHIFT) + slot->userspace_addr)
+               ctf_integer(u64, gfn, gfn)
+               ctf_integer(u8, level, level)
+               ctf_integer(u8, referenced, ref)
+       )
 )
 
 #else
@@ -208,7 +197,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kvm_async_pf_nopresent_ready, kvm_async_pf_ready
        TP_ARGS(token, gva)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) \
+       || LTTNG_RHEL_KERNEL_RANGE(3,10,0,7,1, 3,11,0,0,0))
 
 LTTNG_TRACEPOINT_EVENT(
        kvm_async_pf_completed,