Merge branches 'tracing/branch-tracer', 'tracing/fastboot', 'tracing/function-return-tracer' and 'tracing/urgent' into tracing/core

Browse source

...

This commit is contained in:

Ingo Molnar 2008-11-13 09:48:03 +01:00

parent 94b80ffd65 68f96c0c88 1dc1c6adf3 47e74f2ba8

commit 24de38620d

4 changed files with 15 additions and 46 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

5

arch/x86/kernel/entry_32.S

View file

44

arch/x86/kernel/ftrace.c

View file

8

kernel/trace/ring_buffer.c

View file

4

scripts/bootgraph.pl

View file