From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Feb 2016 04:12:09 +0000 (-0800)
Subject: Merge tag 'trace-fixes-v4.5-rc5-2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.14-rc1~3769
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5bb9871eb8daa2e6a07caf7aeafbe2d0b3faad8f;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'trace-fixes-v4.5-rc5-2' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fix from Steven Rostedt:
 "Another small bug reported to me by Chunyu Hu.

  When perf added a "reg" function to the function tracing event (not a
  tracepoint), it caused that event to be displayed as a tracepoint and
  could cause errors in tracepoint handling.  That was solved by adding
  a flag to ignore ftrace non-tracepoint events.  But that flag was
  missed when displaying events in available_events, which should only
  contain tracepoint events.

  This broke a documented way to enable all events with:

      cat available_events > set_event

  As the function non-tracepoint event would cause that to error out.
  The commit here fixes that by having the available_events file not
  list events that have the ignore flag set"

* tag 'trace-fixes-v4.5-rc5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Fix showing function event in available_events
---

5bb9871eb8daa2e6a07caf7aeafbe2d0b3faad8f