summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-04-22 11:27:36 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-22 11:27:36 -0700
commit4f2112351b4ac964b0249bdd883f7b79601f39d8 (patch)
tree7c4be1f9b11007e0c5681686d58e9c34aa9e19f0 /fs
parent9b60afee50425064fa0a69bea22f07b6ea55ebc1 (diff)
parent3193899d4dd54056f8c2e0b1e40dd6e2f0009f28 (diff)
Merge tag 'trace-v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt: "This adds three fixes for the tracing code. The first is a bug when ftrace_dump_on_oops is triggered in atomic context and function graph tracer is the tracer that is being reported. The second fix is bad parsing of the trace_events from the kernel command line, where it would ignore specific events if the system name is used with defining the event(it enables all events within the system). The last one is a fix to the TRACE_DEFINE_ENUM(), where a check was missing to see if the ptr was incremented to the end of the string, but the loop increments it again and can miss the nul delimiter to stop processing" * tag 'trace-v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: tracing: Fix possible out of bounds memory access when parsing enums tracing: Fix incorrect enabling of trace events by boot cmdline tracing: Handle ftrace_dump() atomic context in graph_trace_open()
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions