From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 8 May 2014 21:17:13 +0000 (-0700)
Subject: Merge tag 'trace-fixes-v3.15-rc4-v2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.0~1892
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f322e262386d155c4b543f51c9939dca525a2948;p=platform%2Fkernel%2Flinux-amlogic.git

Merge tag 'trace-fixes-v3.15-rc4-v2' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fixes from Steven Rostedt:
 "This contains two fixes.

  The first is a long standing bug that causes bogus data to show up in
  the refcnt field of the module_refcnt tracepoint.  It was introduced
  by a merge conflict resolution back in 2.6.35-rc days.

  The result should be 'refcnt = incs - decs', but instead it did
  'refcnt = incs + decs'.

  The second fix is to a bug that was introduced in this merge window
  that allowed for a tracepoint funcs pointer to be used after it was
  freed.  Moving the location of where the probes are released solved
  the problem"

* tag 'trace-fixes-v3.15-rc4-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracepoint: Fix use of tracepoint funcs after rcu free
  trace: module: Maintain a valid user count
---

f322e262386d155c4b543f51c9939dca525a2948