From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 16 Jan 2018 20:09:36 +0000 (-0800)
Subject: Merge tag 'trace-v4.15-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted... 
X-Git-Tag: v4.15-rc9~35
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=921d4f67bfacaa0967231a7d408414aa592ca51c;p=users%2Fhch%2Fmisc.git

Merge tag 'trace-v4.15-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull tracing fixes from Steven Rostedt:

 - Bring back context level recursive protection in ring buffer.

   The simpler counter protection failed, due to a path when tracing
   with trace_clock_global() as it could not be reentrant and depended
   on the ring buffer recursive protection to keep that from happening.

 - Prevent branch profiling when FORTIFY_SOURCE is enabled.

   It causes 50 - 60 MB in warning messages. Branch profiling should
   never be run on production systems, so there's no reason that it
   needs to be enabled with FORTIFY_SOURCE.

* tag 'trace-v4.15-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Prevent PROFILE_ALL_BRANCHES when FORTIFY_SOURCE=y
  ring-buffer: Bring back context level recursive checks
---

921d4f67bfacaa0967231a7d408414aa592ca51c