Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core

2 files changed, 43 insertions, 0 deletions

diff --git a/include/trace/events/power.h b/include/trace/events/power.h
index 1bcc2a8c00e2..14b38940062b 100644
--- a/include/trace/events/power.h
+++ b/include/trace/events/power.h
@@ -151,6 +151,8 @@ enum {
    events get removed */
 static inline void trace_power_start(u64 type, u64 state, u64 cpuid) {};
 static inline void trace_power_end(u64 cpuid) {};
+static inline void trace_power_start_rcuidle(u64 type, u64 state, u64 cpuid) {};
+static inline void trace_power_end_rcuidle(u64 cpuid) {};
 static inline void trace_power_frequency(u64 type, u64 state, u64 cpuid) {};
 #endif /* _PWR_EVENT_AVOID_DOUBLE_DEFINING_DEPRECATED */
 
diff --git a/include/trace/events/printk.h b/include/trace/events/printk.h
new file mode 100644
index 000000000000..94ec79cc011a
--- /dev/null
+++ b/include/trace/events/printk.h
@@ -0,0 +1,41 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM printk
+
+#if !defined(_TRACE_PRINTK_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_PRINTK_H
+
+#include <linux/tracepoint.h>
+
+TRACE_EVENT_CONDITION(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_CONDITION(start != end),
+
+        TP_STRUCT__entry(
+                __dynamic_array(char, msg, end - start + 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;
+        ),
+
+        TP_printk("%s", __get_str(msg))
+);
+#endif /* _TRACE_PRINTK_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>