diff options
author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-03-09 00:40:58 -0500 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2013-03-15 00:35:56 -0400 |
commit | ca268da6e415448a43138e1abc5d5f057af319d7 (patch) | |
tree | 33fcaf68989e12fca96ad86bdece7eaac16d1545 /kernel/trace/trace.c | |
parent | 9d3c752c062e3266f1051ba0825276ea1e2777da (diff) |
tracing: Add internal ftrace trace_puts() for ftrace to use
There's a few places that ftrace uses trace_printk() for internal
use, but this requires context (normal, softirq, irq, NMI) buffers
to keep things lockless. But the trace_puts() does not, as it can
write the string directly into the ring buffer. Make a internal helper
for trace_puts() and have the internal functions use that.
This way the extra context buffers are not used.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r-- | kernel/trace/trace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 5043a0c4dde0..d372c6504c99 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
@@ -443,16 +443,16 @@ void tracing_snapshot(void) | |||
443 | unsigned long flags; | 443 | unsigned long flags; |
444 | 444 | ||
445 | if (!tr->allocated_snapshot) { | 445 | if (!tr->allocated_snapshot) { |
446 | trace_printk("*** SNAPSHOT NOT ALLOCATED ***\n"); | 446 | internal_trace_puts("*** SNAPSHOT NOT ALLOCATED ***\n"); |
447 | trace_printk("*** stopping trace here! ***\n"); | 447 | internal_trace_puts("*** stopping trace here! ***\n"); |
448 | tracing_off(); | 448 | tracing_off(); |
449 | return; | 449 | return; |
450 | } | 450 | } |
451 | 451 | ||
452 | /* Note, snapshot can not be used when the tracer uses it */ | 452 | /* Note, snapshot can not be used when the tracer uses it */ |
453 | if (tracer->use_max_tr) { | 453 | if (tracer->use_max_tr) { |
454 | trace_printk("*** LATENCY TRACER ACTIVE ***\n"); | 454 | internal_trace_puts("*** LATENCY TRACER ACTIVE ***\n"); |
455 | trace_printk("*** Can not use snapshot (sorry) ***\n"); | 455 | internal_trace_puts("*** Can not use snapshot (sorry) ***\n"); |
456 | return; | 456 | return; |
457 | } | 457 | } |
458 | 458 | ||