Namespace kernel version macros

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

diff --git a/instrumentation/events/lttng-module/lttng-statedump.h b/instrumentation/events/lttng-module/lttng-statedump.h
index 916a6c5c3450b2b126e1f7929e6f498b25117322..2d5334f820619ac217c2516413a55b28ed908e0b 100644 (file)
--- a/instrumentation/events/lttng-module/lttng-statedump.h
+++ b/instrumentation/events/lttng-module/lttng-statedump.h
@@ -4,14 +4,14 @@
 #if !defined(LTTNG_TRACE_LTTNG_STATEDUMP_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_LTTNG_STATEDUMP_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/nsproxy.h>
 #include <linux/pid_namespace.h>
 #include <linux/types.h>
-#include <linux/version.h>
+#include <lttng-kernel-version.h>
 
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,19,0))
 #define lttng_proc_inum ns.inum
 #else
 #define lttng_proc_inum proc_inum
@@ -68,9 +68,10 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_state,
                ctf_integer(int, submode, submode)
                ctf_integer(int, status, status)
                ctf_integer(int, ns_level, pid_ns ? pid_ns->level : 0)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
                ctf_integer(unsigned int, ns_inum, pid_ns ? pid_ns->lttng_proc_inum : 0)
 #endif
+               ctf_integer(unsigned int, cpu, task_cpu(p))
        )
 )
 
@@ -140,4 +141,4 @@ LTTNG_TRACEPOINT_EVENT(lttng_statedump_interrupt,
 #endif /*  LTTNG_TRACE_LTTNG_STATEDUMP_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>