X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Finstrumentation%2Fevents%2Fprintk.h;h=0c0b1b3866069667953d30de218dc5d3a1444864;hb=9bb690ee6cbc8a9be1a741a23e8d0e280c55f53c;hp=4e904b6f4b2495b7bdafdb7a7a5950fc6391d657;hpb=0f37abbcb9f06684dcf74554218cfa695d5edaac;p=lttng-modules.git diff --git a/include/instrumentation/events/printk.h b/include/instrumentation/events/printk.h index 4e904b6f..0c0b1b38 100644 --- a/include/instrumentation/events/printk.h +++ b/include/instrumentation/events/printk.h @@ -8,8 +8,6 @@ #include #include -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,10,0)) - LTTNG_TRACEPOINT_EVENT_MAP(console, printk_console, @@ -23,53 +21,6 @@ LTTNG_TRACEPOINT_EVENT_MAP(console, ) ) -#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_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 /* (LTTNG_LINUX_VERSION_CODE < LTTNG_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 */