summaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_output.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-07-10 11:41:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-10 11:41:41 -0700
commit2a6f86bc5ed4af2ff04bc927eb77789c70e53a1e (patch)
treef14b3a1547a0f26789658f2939c904e180369482 /kernel/trace/trace_output.c
parentb690a3770e99497982d48a93e30cb7de549aead8 (diff)
parente1af3aec3e2e7d21d4b3054323779d478c19d907 (diff)
downloadkernel-crypto-2a6f86bc5ed4af2ff04bc927eb77789c70e53a1e.tar.gz
kernel-crypto-2a6f86bc5ed4af2ff04bc927eb77789c70e53a1e.tar.xz
kernel-crypto-2a6f86bc5ed4af2ff04bc927eb77789c70e53a1e.zip
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: tracing: Fix trace_print_seq() kprobes: No need to unlock kprobe_insn_mutex tracing/fastboot: Document the need of initcall_debug trace_export: Repair missed fields tracing: Fix stack tracer sysctl handling
Diffstat (limited to 'kernel/trace/trace_output.c')
-rw-r--r--kernel/trace/trace_output.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index 7938f3ae93e..e0c2545622e 100644
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -27,8 +27,7 @@ void trace_print_seq(struct seq_file *m, struct trace_seq *s)
{
int len = s->len >= PAGE_SIZE ? PAGE_SIZE - 1 : s->len;
- s->buffer[len] = 0;
- seq_puts(m, s->buffer);
+ seq_write(m, s->buffer, len);
trace_seq_init(s);
}