X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=include%2Finstrumentation%2Fevents%2Fprintk.h;h=0c0b1b3866069667953d30de218dc5d3a1444864;hb=612c99eb24bf72f4d47d02025e92de8c35ece14e;hp=75b4ee9239c66fd6f9465197ac238302821ea7e8;hpb=4f47ccf08dfac3d5db7553eb8b40bdab19764727;p=lttng-modules.git

diff --git a/include/instrumentation/events/printk.h b/include/instrumentation/events/printk.h
index 75b4ee92..0c0b1b38 100644
--- a/include/instrumentation/events/printk.h
+++ b/include/instrumentation/events/printk.h
@@ -6,9 +6,7 @@
 #define LTTNG_TRACE_PRINTK_H
 
 #include <lttng/tracepoint-event.h>
-#include <linux/version.h>
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0))
+#include <lttng/kernel-version.h>
 
 LTTNG_TRACEPOINT_EVENT_MAP(console,
 
@@ -23,53 +21,6 @@ LTTNG_TRACEPOINT_EVENT_MAP(console,
 	)
 )
 
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
-
-LTTNG_TRACEPOINT_EVENT_MAP(console,
-
-	printk_console,
-
-	TP_PROTO(const char *log_buf, unsigned start, unsigned end,
-		 unsigned log_buf_len),
-
-	TP_ARGS(log_buf, start, end, log_buf_len),
-
-	TP_FIELDS(
-		ctf_sequence_text(char, msg, log_buf + start,
-			size_t, end - start)
-	)
-)
-
-#else /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) */
-
-LTTNG_TRACEPOINT_EVENT_MAP(console,
-
-	printk_console,
-
-	TP_PROTO(const char *log_buf, unsigned start, unsigned end,
-		 unsigned log_buf_len),
-
-	TP_ARGS(log_buf, start, end, log_buf_len),
-
-	TP_FIELDS(
-		/*
-		 * printk buffer is gathered from two segments on older kernels.
-		 */
-		ctf_sequence_text(char, msg1,
-			log_buf + (start & (log_buf_len - 1)),
-			size_t, (start & (log_buf_len - 1)) > (end & (log_buf_len - 1))
-				? log_buf_len - (start & (log_buf_len - 1))
-				: end - start)
-		ctf_sequence_text(char, msg2,
-			log_buf,
-			size_t, (start & (log_buf_len - 1)) > (end & (log_buf_len - 1))
-				? end & (log_buf_len - 1)
-				: 0)
-	)
-)
-
-#endif
-
 #endif /* LTTNG_TRACE_PRINTK_H */
 
 /* This part must be outside protection */