X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fprintk.h;h=b01ac59b22dcaf8a32b9a65020041f8ec6b2b0cd;hb=2d0428212cbfa3f8428feee160b095f48c2ac974;hp=77fe081b36e835ff26ac6a92afc26bce3fbcecef;hpb=f127e61ee231d002fb9a7803643a157e06f6d2e2;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/printk.h b/instrumentation/events/lttng-module/printk.h
index 77fe081b..b01ac59b 100644
--- a/instrumentation/events/lttng-module/printk.h
+++ b/instrumentation/events/lttng-module/printk.h
@@ -1,13 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM printk
 
 #if !defined(LTTNG_TRACE_PRINTK_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_PRINTK_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
-#include <linux/version.h>
+#include <probes/lttng-tracepoint-event.h>
+#include <lttng-kernel-version.h>
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,10,0))
 
 LTTNG_TRACEPOINT_EVENT_MAP(console,
 
@@ -22,9 +23,9 @@ LTTNG_TRACEPOINT_EVENT_MAP(console,
 	)
 )
 
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,5,0))
 
-LTTNG_TRACEPOINT_EVENT_CONDITION_MAP(console,
+LTTNG_TRACEPOINT_EVENT_MAP(console,
 
 	printk_console,
 
@@ -33,17 +34,15 @@ LTTNG_TRACEPOINT_EVENT_CONDITION_MAP(console,
 
 	TP_ARGS(log_buf, start, end, log_buf_len),
 
-	TP_CONDITION(start != end),
-
 	TP_FIELDS(
 		ctf_sequence_text(char, msg, log_buf + start,
 			size_t, end - start)
 	)
 )
 
-#else /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) */
+#else /* (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(3,5,0)) */
 
-LTTNG_TRACEPOINT_EVENT_CONDITION_MAP(console,
+LTTNG_TRACEPOINT_EVENT_MAP(console,
 
 	printk_console,
 
@@ -52,8 +51,6 @@ LTTNG_TRACEPOINT_EVENT_CONDITION_MAP(console,
 
 	TP_ARGS(log_buf, start, end, log_buf_len),
 
-	TP_CONDITION(start != end),
-
 	TP_FIELDS(
 		/*
 		 * printk buffer is gathered from two segments on older kernels.
@@ -76,4 +73,4 @@ LTTNG_TRACEPOINT_EVENT_CONDITION_MAP(console,
 #endif /* LTTNG_TRACE_PRINTK_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>