Merge branches 'tracing/kmemtrace2' and 'tracing/ftrace' into tracing/urgent

Browse source

...

This commit is contained in:

Ingo Molnar 2009-01-06 10:18:43 +01:00

parent 3e80680208 a103e2ab73

commit 99793e3dbe

13 changed files with 1392 additions and 836 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

kernel/trace/Makefile

View file

741

kernel/trace/trace.c

View file

36

kernel/trace/trace.h

View file

1

kernel/trace/trace_boot.c

View file

331

kernel/trace/trace_branch.c

View file

4

kernel/trace/trace_functions_graph.c

View file

1

kernel/trace/trace_hw_branches.c

View file

4

kernel/trace/trace_mmiotrace.c

View file

832

kernel/trace/trace_output.c

View file

59

kernel/trace/trace_output.h

View file

1

kernel/trace/trace_power.c

View file

1

kernel/trace/trace_selftest.c

View file

251

kernel/trace/trace_stat.c

View file