Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace

Browse source

...

This commit is contained in:

Ingo Molnar 2009-03-06 11:40:37 +01:00

parent 1609743970 770cb24345

commit bc722f508a

12 changed files with 357 additions and 92 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

29

include/linux/kernel.h

View file

15

include/linux/ring_buffer.h

View file

1

kernel/trace/Makefile

View file

10

kernel/trace/ftrace.c

View file

2

kernel/trace/ring_buffer.c

View file

24

kernel/trace/trace.c

View file

165

kernel/trace/trace_event_types.h

View file

12

kernel/trace/trace_events.c

View file

53

kernel/trace/trace_events_stage_2.h

View file

81

kernel/trace/trace_export.c

View file

55

kernel/trace/trace_format.h

View file

2

kernel/trace/trace_sysprof.c

View file