From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 10 Jan 2017 16:29:49 +0000 (-0500)
Subject: timer instrumentation: adapt to ktime_t without union
X-Git-Tag: v2.8.5~14
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=2e7742fafed7d35f9e6f6b73554035630df51029;p=lttng-modules.git

timer instrumentation: adapt to ktime_t without union

Introduced in Linux upstream in 4.10.

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

diff --git a/instrumentation/events/lttng-module/timer.h b/instrumentation/events/lttng-module/timer.h
index eb225eb9..9c02c967 100644
--- a/instrumentation/events/lttng-module/timer.h
+++ b/instrumentation/events/lttng-module/timer.h
@@ -16,6 +16,12 @@ struct timer_list;
 
 #endif /* _TRACE_TIMER_DEF_ */
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
+#define lttng_ktime_get_tv64(kt)	(kt)
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
+#define lttng_ktime_get_tv64(kt)	((kt).tv64)
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
+
 LTTNG_TRACEPOINT_EVENT_CLASS(timer_class,
 
 	TP_PROTO(struct timer_list *timer),
@@ -165,8 +171,10 @@ LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_start,
 	TP_FIELDS(
 		ctf_integer_hex(void *, hrtimer, hrtimer)
 		ctf_integer_hex(void *, function, hrtimer->function)
-		ctf_integer(s64, expires, hrtimer_get_expires(hrtimer).tv64)
-		ctf_integer(s64, softexpires, hrtimer_get_softexpires(hrtimer).tv64)
+		ctf_integer(s64, expires,
+			lttng_ktime_get_tv64(hrtimer_get_expires(hrtimer)))
+		ctf_integer(s64, softexpires,
+			lttng_ktime_get_tv64(hrtimer_get_softexpires(hrtimer)))
 	)
 )
 
@@ -188,7 +196,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_expire_entry,
 
 	TP_FIELDS(
 		ctf_integer_hex(void *, hrtimer, hrtimer)
-		ctf_integer(s64, now, now->tv64)
+		ctf_integer(s64, now, lttng_ktime_get_tv64(*now))
 		ctf_integer_hex(void *, function, hrtimer->function)
 	)
 )