diff options
-rw-r--r-- | kernel/trace/trace.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index a6ffc8918dda..bda9621638cc 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
@@ -468,6 +468,9 @@ int __trace_puts(unsigned long ip, const char *str, int size) | |||
468 | int alloc; | 468 | int alloc; |
469 | int pc; | 469 | int pc; |
470 | 470 | ||
471 | if (!(trace_flags & TRACE_ITER_PRINTK)) | ||
472 | return 0; | ||
473 | |||
471 | pc = preempt_count(); | 474 | pc = preempt_count(); |
472 | 475 | ||
473 | if (unlikely(tracing_selftest_running || tracing_disabled)) | 476 | if (unlikely(tracing_selftest_running || tracing_disabled)) |
@@ -515,6 +518,9 @@ int __trace_bputs(unsigned long ip, const char *str) | |||
515 | int size = sizeof(struct bputs_entry); | 518 | int size = sizeof(struct bputs_entry); |
516 | int pc; | 519 | int pc; |
517 | 520 | ||
521 | if (!(trace_flags & TRACE_ITER_PRINTK)) | ||
522 | return 0; | ||
523 | |||
518 | pc = preempt_count(); | 524 | pc = preempt_count(); |
519 | 525 | ||
520 | if (unlikely(tracing_selftest_running || tracing_disabled)) | 526 | if (unlikely(tracing_selftest_running || tracing_disabled)) |