From: Mathieu Desnoyers Date: Mon, 13 Apr 2020 20:23:32 +0000 (-0400) Subject: instrumentation: printk: remove compatibility code X-Git-Tag: for-upstreaming-review-1~52 X-Git-Url: http://git.liburcu.org/?p=lttng-modules.git;a=commitdiff_plain;h=143da7d18f7d7cdbb2fb79458e199e07bf985548 instrumentation: printk: remove compatibility code --- diff --git a/instrumentation/events/lttng-module/printk.h b/instrumentation/events/lttng-module/printk.h index 444f299b..26b04a95 100644 --- a/instrumentation/events/lttng-module/printk.h +++ b/instrumentation/events/lttng-module/printk.h @@ -6,9 +6,6 @@ #define LTTNG_TRACE_PRINTK_H #include -#include - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)) LTTNG_TRACEPOINT_EVENT_MAP(console, @@ -23,53 +20,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 */