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

Browse source

...

This commit is contained in:

Ingo Molnar 2011-07-05 11:55:43 +02:00

parent 5d67be97f8 1fd8df2c39

commit 931da6137e

18 changed files with 333 additions and 321 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

2

arch/x86/kernel/stacktrace.c

View file

2

arch/x86/mm/kmemcheck/error.c

View file

4

include/linux/ftrace_event.h

View file

2

include/linux/ring_buffer.h

View file

4

include/linux/stacktrace.h

View file

12

kernel/async.c

View file

12

kernel/stacktrace.c

View file

20

kernel/trace/ftrace.c

View file

66

kernel/trace/ring_buffer.c

View file

2

kernel/trace/ring_buffer_benchmark.c

View file

242

kernel/trace/trace.c

View file

10

kernel/trace/trace.h

View file

26

kernel/trace/trace_events.c

View file

223

kernel/trace/trace_functions_graph.c

View file

4

kernel/trace/trace_irqsoff.c

View file

6

kernel/trace/trace_kprobe.c

View file

4

kernel/trace/trace_sched_wakeup.c

View file

13

kernel/trace/trace_stack.c

View file