diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-14 20:22:16 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-14 20:22:16 -0800 |
commit | 406089d01562f1e2bf9f089fd7637009ebaad589 (patch) | |
tree | 1b8202a1b91354eb8abb7b35eef2cee02ef92a75 /crypto/rng.c | |
parent | 7dea1ff3b7b48356c02cb00d6a4e8d5aaf680830 (diff) | |
parent | 250bfd3d8e7e19cb649dd94689f0af2ce3474060 (diff) | |
download | linux-406089d01562f1e2bf9f089fd7637009ebaad589.tar.gz linux-406089d01562f1e2bf9f089fd7637009ebaad589.tar.bz2 linux-406089d01562f1e2bf9f089fd7637009ebaad589.zip |
Merge tag 'trace-3.8-rc3-regression-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing regression fixes from Steven Rostedt:
"The clean up patch commit 0fb9656d957d "tracing: Make tracing_enabled
be equal to tracing_on" caused two regressions.
1) The irqs off latency tracer no longer starts if tracing_on is off
when the tracer is set, and then tracing_on is enabled. The
tracing_on file needs the hook that tracing_enabled had to enable
tracers if they request it (call the tracer's start() method).
2) That commit had a separate change that really should have been a
separate patch, but it must have been added accidently with the -a
option of git commit. But as the change is still related to the
commit it wasn't noticed in review. That change, changed the way
blocking is done by the trace_pipe file with respect to the
tracing_on settings. I've been told that this change breaks
current userspace, and this specific change is being reverted."
* tag 'trace-3.8-rc3-regression-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing: Fix regression of trace_pipe
tracing: Fix regression with irqsoff tracer and tracing_on file
Diffstat (limited to 'crypto/rng.c')
0 files changed, 0 insertions, 0 deletions