X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fkvm.h;h=cb730118e208b3bbd73cfc4c16fbb68542b74efc;hb=5a2f5e92e422d87a28581ba97e6b1789ff743bc6;hp=3a6585fbab90f6158421b5471a1d4dbd2b004375;hpb=f127e61ee231d002fb9a7803643a157e06f6d2e2;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/kvm.h b/instrumentation/events/lttng-module/kvm.h
old mode 100755
new mode 100644
index 3a6585fb..cb730118
--- a/instrumentation/events/lttng-module/kvm.h
+++ b/instrumentation/events/lttng-module/kvm.h
@@ -111,30 +111,20 @@ LTTNG_TRACEPOINT_EVENT(kvm_fpu,
 	)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0) \
+	|| LTTNG_RHEL_KERNEL_RANGE(3,10,0,7,2, 3,11,0,0,0))
 
 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 +198,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,