From 75c7a7ac473e9ef2eb2d2b47e112f608c78fa5ca Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Fri, 27 Feb 2009 00:22:21 -0500 Subject: [PATCH] --- yaml --- r: 140815 b: refs/heads/master c: 5c6a3ae1b4beebb56e2916b84f1208d96a9e32ff h: refs/heads/master i: 140813: abb9e25508f3a21d926195554788794e7b0b92d5 140811: 282140615c6e8afe78881e8edf761aff918702f7 140807: 771f109f78d642605a6b3b4f289fb7dea024e88c 140799: 06625dc8709ea6ea65a3d8baf223351863802427 v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 197c45d7fbbb..e72a8e700d16 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85a2f9b46f8cd8aaa11c64c715e1ea3ec27ec486 +refs/heads/master: 5c6a3ae1b4beebb56e2916b84f1208d96a9e32ff diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c index 304e02ce39c4..5db7485158df 100644 --- a/trunk/kernel/trace/trace.c +++ b/trunk/kernel/trace/trace.c @@ -2037,7 +2037,7 @@ tracing_trace_options_read(struct file *filp, char __user *ubuf, /* calculate max size */ for (i = 0; trace_options[i]; i++) { len += strlen(trace_options[i]); - len += 3; /* "no" and space */ + len += 3; /* "no" and newline */ } mutex_lock(&trace_types_lock); @@ -2050,7 +2050,7 @@ tracing_trace_options_read(struct file *filp, char __user *ubuf, */ for (i = 0; trace_opts[i].name; i++) { len += strlen(trace_opts[i].name); - len += 3; /* "no" and space */ + len += 3; /* "no" and newline */ } /* +2 for \n and \0 */ @@ -2062,22 +2062,21 @@ tracing_trace_options_read(struct file *filp, char __user *ubuf, for (i = 0; trace_options[i]; i++) { if (trace_flags & (1 << i)) - r += sprintf(buf + r, "%s ", trace_options[i]); + r += sprintf(buf + r, "%s\n", trace_options[i]); else - r += sprintf(buf + r, "no%s ", trace_options[i]); + r += sprintf(buf + r, "no%s\n", trace_options[i]); } for (i = 0; trace_opts[i].name; i++) { if (tracer_flags & trace_opts[i].bit) - r += sprintf(buf + r, "%s ", + r += sprintf(buf + r, "%s\n", trace_opts[i].name); else - r += sprintf(buf + r, "no%s ", + r += sprintf(buf + r, "no%s\n", trace_opts[i].name); } mutex_unlock(&trace_types_lock); - r += sprintf(buf + r, "\n"); WARN_ON(r >= len + 2); r = simple_read_from_buffer(ubuf, cnt, ppos, buf, r);