Merge branch 'tracing/ftrace' into tracing/function-return-tracer

Browse source

...

This commit is contained in:

Ingo Molnar 2008-11-16 07:57:13 +01:00

parent c91add5fa6 1c80025a49

commit 985809608f

18 changed files with 284 additions and 164 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

8

arch/x86/include/asm/ftrace.h

View file

29

arch/x86/kernel/ftrace.c

View file

55

include/linux/ftrace.h

View file

2

kernel/module.c

View file

326

kernel/trace/ftrace.c

View file

23

kernel/trace/trace.c

View file

3

kernel/trace/trace.h

View file

3

kernel/trace/trace_boot.c

View file

3

kernel/trace/trace_branch.c

View file

3

kernel/trace/trace_functions.c

View file

3

kernel/trace/trace_functions_return.c

View file

9

kernel/trace/trace_irqsoff.c

View file

3

kernel/trace/trace_mmiotrace.c

View file

3

kernel/trace/trace_nop.c

View file

3

kernel/trace/trace_sched_switch.c

View file

3

kernel/trace/trace_sched_wakeup.c

View file

70

kernel/trace/trace_selftest.c

View file

3

kernel/trace/trace_sysprof.c

View file