Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core

Browse source

...

This commit is contained in:

Ingo Molnar 2008-12-03 08:49:21 +01:00

parent 66eafebc10 48d68b20d0

commit f0461d0146

5 changed files with 89 additions and 3 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/Kconfig

View file

1

arch/x86/kernel/Makefile

View file

74

arch/x86/kernel/entry_64.S

View file

11

arch/x86/kernel/ftrace.c

View file

4

kernel/trace/ftrace.c

View file