summaryrefslogtreecommitdiff
path: root/kernel/printk.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2012-02-17 12:55:07 +0100
committerIngo Molnar <mingo@elte.hu>2012-02-17 12:55:07 +0100
commit09bda4432a8a4d4db2b2b94697abc8d732a9ff73 (patch)
tree8449aac6af302967dcbabdfb315bf691491a4241 /kernel/printk.c
parentd1e169da9e20efc0762da6ec160dd7740d0103f5 (diff)
parent47b0edcb599ea6eb9ef16d3a08932a0e01485293 (diff)
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Diffstat (limited to 'kernel/printk.c')
-rw-r--r--kernel/printk.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/printk.c b/kernel/printk.c
index 13c0a1143f49..cb8a6bd697c6 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -44,6 +44,9 @@
#include <asm/uaccess.h>
+#define CREATE_TRACE_POINTS
+#include <trace/events/printk.h>
+
/*
* Architectures can override it:
*/
@@ -542,6 +545,8 @@ MODULE_PARM_DESC(ignore_loglevel, "ignore loglevel setting, to"
static void _call_console_drivers(unsigned start,
unsigned end, int msg_log_level)
{
+ trace_console(&LOG_BUF(0), start, end, log_buf_len);
+
if ((msg_log_level < console_loglevel || ignore_loglevel) &&
console_drivers && start != end) {
if ((start & LOG_BUF_MASK) > (end & LOG_BUF_MASK)) {