Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / include / trace / events / printk.h

diff --git a/include/trace/events/printk.h b/include/trace/events/printk.h
index 94ec79cc011ae76bd77f5f2adb40ff09343f1cdb..c008bc99f9fa9093beb2668f2ebb33a72b825715 100644 (file)
--- a/include/trace/events/printk.h
+++ b/include/trace/events/printk.h
@@ -6,31 +6,18 @@
 
 #include <linux/tracepoint.h>
 
-TRACE_EVENT_CONDITION(console,
-       TP_PROTO(const char *log_buf, unsigned start, unsigned end,
-                unsigned log_buf_len),
+TRACE_EVENT(console,
+       TP_PROTO(const char *text, size_t len),
 
-       TP_ARGS(log_buf, start, end, log_buf_len),
-
-       TP_CONDITION(start != end),
+       TP_ARGS(text, len),
 
        TP_STRUCT__entry(
-               __dynamic_array(char, msg, end - start + 1)
+               __dynamic_array(char, msg, len + 1)
        ),
 
        TP_fast_assign(
-               if ((start & (log_buf_len - 1)) > (end & (log_buf_len - 1))) {
-                       memcpy(__get_dynamic_array(msg),
-                              log_buf + (start & (log_buf_len - 1)),
-                              log_buf_len - (start & (log_buf_len - 1)));
-                       memcpy((char *)__get_dynamic_array(msg) +
-                              log_buf_len - (start & (log_buf_len - 1)),
-                              log_buf, end & (log_buf_len - 1));
-               } else
-                       memcpy(__get_dynamic_array(msg),
-                              log_buf + (start & (log_buf_len - 1)),
-                              end - start);
-               ((char *)__get_dynamic_array(msg))[end - start] = 0;
+               memcpy(__get_dynamic_array(msg), text, len);
+               ((char *)__get_dynamic_array(msg))[len] = 0;
        ),
 
        TP_printk("%s", __get_str(msg))