Merge "coresight: don't directly log printk to STM"
diff --git a/include/linux/coresight-stm.h b/include/linux/coresight-stm.h
index 2c3a347..9ff81f4 100644
--- a/include/linux/coresight-stm.h
+++ b/include/linux/coresight-stm.h
@@ -19,7 +19,6 @@
OST_ENTITY_TRACE_PRINTK = 0x02,
OST_ENTITY_TRACE_MARKER = 0x04,
OST_ENTITY_DEV_NODE = 0x08,
- OST_ENTITY_PRINTK = 0x10,
OST_ENTITY_ALL = 0x1F,
};
diff --git a/kernel/printk.c b/kernel/printk.c
index d72977b..da1470a 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -41,7 +41,6 @@
#include <linux/cpu.h>
#include <linux/notifier.h>
#include <linux/rculist.h>
-#include <linux/coresight-stm.h>
#include <asm/uaccess.h>
@@ -963,8 +962,6 @@
}
}
- stm_log(OST_ENTITY_PRINTK, printk_buf, printed_len);
-
/*
* Copy the output into log_buf. If the caller didn't provide
* the appropriate log prefix, we insert them here