Commit 4ffd4ebf authored Jan 10, 2013 by Linus Torvalds

Merge tag 'trace-3.8-rc2-regression-fix' of...

Merge tag 'trace-3.8-rc2-regression-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull tracing regression fix from Steven Rostedt:
 "A change that came in this merge window broke the writing to the
  trace_options file.  It causes garbage to be read during the compare
  of option names, and breaks setting options via the trace_options
  file, although options can still be set via the options/<option>
  files."

* tag 'trace-3.8-rc2-regression-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Fix regression of trace_options file setting

parents 7be72c39 a8dd2176

kernel/trace/trace.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -2899,6 +2899,8 @@ tracing_trace_options_write(struct file filp, const char __user ubuf,
		if (copy_from_user(&buf, ubuf, cnt))
		return -EFAULT;

		buf[cnt] = 0;

		trace_set_options(buf);

		*ppos += cnt;