diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-08 23:17:13 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-08 23:17:13 +0200 |
| commit | f322e262386d155c4b543f51c9939dca525a2948 (patch) | |
| tree | 9b4830ee578bc9058496ec4094392414cd5112f3 /include/clocksource | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto... (diff) | |
| parent | tracepoint: Fix use of tracepoint funcs after rcu free (diff) | |
| download | linux-f322e262386d155c4b543f51c9939dca525a2948.tar.xz linux-f322e262386d155c4b543f51c9939dca525a2948.zip | |
Merge tag 'trace-fixes-v3.15-rc4-v2' of git://git.kernel.org/pub/scm/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
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions