From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 30 Aug 2016 21:02:09 +0000 (-0400)
Subject: Fix: napi instrumentation for 4.8 kernels
X-Git-Tag: v2.9.0-rc1~26
X-Git-Url: http://git.lttng.org/?p=lttng-modules.git;a=commitdiff_plain;h=9e8691779f3424318ad4925d444ebe959038ec2b

Fix: napi instrumentation for 4.8 kernels

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

diff --git a/instrumentation/events/lttng-module/napi.h b/instrumentation/events/lttng-module/napi.h
index 1126dd4c..7b5ecfc4 100644
--- a/instrumentation/events/lttng-module/napi.h
+++ b/instrumentation/events/lttng-module/napi.h
@@ -10,6 +10,24 @@
 
 #define NO_DEV "(no_device)"
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0))
+
+LTTNG_TRACEPOINT_EVENT(napi_poll,
+
+	TP_PROTO(struct napi_struct *napi, int work, int budget),
+
+	TP_ARGS(napi, work, budget),
+
+	TP_FIELDS(
+		ctf_integer_hex(struct napi_struct *, napi, napi)
+		ctf_string(dev_name, napi->dev ? napi->dev->name : NO_DEV)
+		ctf_integer(int, work, work)
+		ctf_integer(int, budget, budget)
+	)
+)
+
+#else
+
 LTTNG_TRACEPOINT_EVENT(napi_poll,
 
 	TP_PROTO(struct napi_struct *napi),
@@ -22,6 +40,8 @@ LTTNG_TRACEPOINT_EVENT(napi_poll,
 	)
 )
 
+#endif
+
 #undef NO_DEV
 
 #endif /* LTTNG_TRACE_NAPI_H */