1 files changed, 12 insertions, 1 deletions

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 9c5b231684d0..41f840cea1a4 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -64,6 +64,13 @@ int console_printk[4] = {
 };
 
 /*
+ * divert printk() messages when there is a LITMUS^RT debug listener
+ */
+#include <litmus/debug_trace.h>
+int trace_override = 0;
+int trace_recurse  = 0;
+
+/*
  * Low level drivers may need that to know if they can schedule in
  * their unblank() callback or not. So let's export it.
  */
@@ -1842,6 +1849,10 @@ asmlinkage int vprintk_emit(int facility, int level,
          */
         text_len = vscnprintf(text, sizeof(textbuf), fmt, args);
 
+        /* if LITMUS^RT tracer is active divert printk() msgs */
+        if (trace_override && !trace_recurse)
+                TRACE("%s", text);
+
         /* mark and strip a trailing newline */
         if (text_len && text[text_len-1] == '\n') {
                 text_len--;
@@ -2874,7 +2885,7 @@ static DEFINE_PER_CPU(struct irq_work, wake_up_klogd_work) = {
 void wake_up_klogd(void)
 {
         preempt_disable();
-        if (waitqueue_active(&log_wait)) {
+        if (!trace_override && waitqueue_active(&log_wait)) {
                 this_cpu_or(printk_pending, PRINTK_PENDING_WAKEUP);
                 irq_work_queue(this_cpu_ptr(&wake_up_klogd_work));
         }