summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/uapi/asm/msr-index.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-08-04 12:02:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-04 12:02:48 -0700
commitc9b88e9581828bb8bba06c5e7ee8ed1761172b6e (patch)
tree08f025f4e5ff9f33bb40f89e790a1dd6db04e75c /arch/x86/include/uapi/asm/msr-index.h
parentb8c0aa46b3e86083721b57ed2eec6bd2c29ebfba (diff)
parent6355d54438bfc3b636cb6453cd091f782fb9b4d7 (diff)
Merge tag 'trace-3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing filter cleanups from Steven Rostedt: "Oleg Nesterov did several clean ups with the tracing filter code. As he found some small bugs that went into 3.16, and these changes were based on that, I had to apply his changes to a separate branch than my main development branch. This was based on work that was already pulled into 3.16, and is a separate pull request to keep from having local merges in my pull request" * tag 'trace-3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: tracing: Kill "filter_string" arg of replace_preds() tracing: Change apply_subsystem_event_filter() paths to check file->system == dir tracing: Kill ftrace_event_call->files tracing/uprobes: Kill the dead TRACE_EVENT_FL_USE_CALL_FILTER logic tracing: Kill call_filter_disable() tracing: Kill destroy_call_preds() tracing: Kill destroy_preds() and destroy_file_preds()
Diffstat (limited to 'arch/x86/include/uapi/asm/msr-index.h')
0 files changed, 0 insertions, 0 deletions