1 files changed, 6 insertions, 0 deletions

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index b7f5471ae518..6dbdf277c8fe 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -424,6 +424,9 @@ int __trace_puts(unsigned long ip, const char *str, int size)
         unsigned long irq_flags;
         int alloc;
 
+        if (unlikely(tracing_selftest_running || tracing_disabled))
+                return 0;
+
         alloc = sizeof(*entry) + size + 2; /* possible \n added */
 
         local_save_flags(irq_flags);
@@ -464,6 +467,9 @@ int __trace_bputs(unsigned long ip, const char *str)
         unsigned long irq_flags;
         int size = sizeof(struct bputs_entry);
 
+        if (unlikely(tracing_selftest_running || tracing_disabled))
+                return 0;
+
         local_save_flags(irq_flags);
         buffer = global_trace.trace_buffer.buffer;
         event = trace_buffer_lock_reserve(buffer, TRACE_BPUTS, size,