Merge remote-tracking branch 'trace/tip/x86/trace' into x86/trace

Browse source

Fix from Steven Rostedt.

...

This commit is contained in:

H. Peter Anvin 2013-06-24 11:01:09 -07:00

parent 33e5ff634f 2b4bc78956

commit 5236eb968e

2 changed files with 8 additions and 6 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

10

arch/x86/include/asm/desc.h

View file

4

arch/x86/kernel/tracepoint.c

View file