Fix: update block instrumentation to compile on 4.8 kernels

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

diff --git a/instrumentation/events/lttng-module/napi.h b/instrumentation/events/lttng-module/napi.h
index d6df1817d4c53d7b9df63eb50d9dd0fe73ec3d3d..1126dd4c29badb5f94fbae7c4395ecf13fa5a830 100644 (file)
--- a/instrumentation/events/lttng-module/napi.h
+++ b/instrumentation/events/lttng-module/napi.h
@@ -4,7 +4,7 @@
 #if !defined(LTTNG_TRACE_NAPI_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_NAPI_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/netdevice.h>
 #include <linux/ftrace.h>
 
@@ -16,18 +16,10 @@ LTTNG_TRACEPOINT_EVENT(napi_poll,
 
        TP_ARGS(napi),
 
-       TP_STRUCT__entry(
-               __field(        struct napi_struct *,   napi)
-               __string(       dev_name, napi->dev ? napi->dev->name : NO_DEV)
-       ),
-
-       TP_fast_assign(
-               tp_assign(napi, napi)
-               tp_strcpy(dev_name, napi->dev ? napi->dev->name : NO_DEV)
-       ),
-
-       TP_printk("napi poll on napi struct %p for device %s",
-               __entry->napi, __get_str(dev_name))
+       TP_FIELDS(
+               ctf_integer_hex(struct napi_struct *, napi, napi)
+               ctf_string(dev_name, napi->dev ? napi->dev->name : NO_DEV)
+       )
 )
 
 #undef NO_DEV
@@ -35,4 +27,4 @@ LTTNG_TRACEPOINT_EVENT(napi_poll,
 #endif /* LTTNG_TRACE_NAPI_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>