diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-11 17:04:59 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-11 17:04:59 -0700 |
commit | 26b840ae5d5140fe7b2226098826c449e63de072 (patch) | |
tree | 0f4a6f1575a7f0e49f63da7920258e1e89359036 /drivers/tty | |
parent | 607eeb0b836aa24a6972a460a213c4f87902d403 (diff) | |
parent | b8820084f2130b3dcfb09c78ac16cdd2194a345b (diff) | |
download | kernel_goldelico_gta04-26b840ae5d5140fe7b2226098826c449e63de072.zip kernel_goldelico_gta04-26b840ae5d5140fe7b2226098826c449e63de072.tar.gz kernel_goldelico_gta04-26b840ae5d5140fe7b2226098826c449e63de072.tar.bz2 |
Merge tag 'trace-fixes-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing/kprobes update from Steven Rostedt:
"The majority of these changes are from Masami Hiramatsu bringing
kprobes up to par with the latest changes to ftrace (multi buffering
and the new function probes).
He also discovered and fixed some bugs in doing so. When pulling in
his patches, I also found a few minor bugs as well and fixed them.
This also includes a compile fix for some archs that select the ring
buffer but not tracing.
I based this off of the last patch you took from me that fixed the
merge conflict error, as that was the commit that had all the changes
I needed for this set of changes."
* tag 'trace-fixes-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing/kprobes: Support soft-mode disabling
tracing/kprobes: Support ftrace_event_file base multibuffer
tracing/kprobes: Pass trace_probe directly from dispatcher
tracing/kprobes: Increment probe hit-count even if it is used by perf
tracing/kprobes: Use bool for retprobe checker
ftrace: Fix function probe when more than one probe is added
ftrace: Fix the output of enabled_functions debug file
ftrace: Fix locking in register_ftrace_function_probe()
tracing: Add helper function trace_create_new_event() to remove duplicate code
tracing: Modify soft-mode only if there's no other referrer
tracing: Indicate enabled soft-mode in enable file
tracing/kprobes: Fix to increment return event probe hit-count
ftrace: Cleanup regex_lock and ftrace_lock around hash updating
ftrace, kprobes: Fix a deadlock on ftrace_regex_lock
ftrace: Have ftrace_regex_write() return either read or error
tracing: Return error if register_ftrace_function_probe() fails for event_enable_func()
tracing: Don't succeed if event_enable_func did not register anything
ring-buffer: Select IRQ_WORK
Diffstat (limited to 'drivers/tty')
0 files changed, 0 insertions, 0 deletions