Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core

Browse source

Pull ftrace robustization fixes from Steve Rostedt.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

...

This commit is contained in:

Ingo Molnar 2012-06-18 10:57:51 +02:00

parent e227051b13 7374e82771

commit 4983955c04

3 changed files with 6 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

include/linux/ftrace_event.h

View file

8

kernel/trace/ftrace.c

View file

2

kernel/trace/trace_output.c

View file