From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Jan 2013 04:22:16 +0000 (-0800)
Subject: Merge tag 'trace-3.8-rc3-regression-fix' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.8-rc4~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=406089d01562f1e2bf9f089fd7637009ebaad589;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge tag 'trace-3.8-rc3-regression-fix' of git://git./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
---

406089d01562f1e2bf9f089fd7637009ebaad589