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

Browse source

Pull ftrace fixlets from Steve Rostedt.

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

...

This commit is contained in:

Ingo Molnar 2012-08-21 11:36:39 +02:00

parent bcada3d4b8 87abb3b15c

commit a0e0fac633

4 changed files with 19 additions and 20 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

4

kernel/trace/ring_buffer.c

View file

6

kernel/trace/trace.c

View file

2

kernel/trace/trace_events_filter.c

View file

27

kernel/trace/trace_selftest.c

View file