Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2ea122c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'tracing-fixes-for-linus' of... 

Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  tracing: consolidate documents
  blktrace: pass the right pointer to kfree()
  tracing/syscalls: use a dedicated file header
  tracing: append a comma to INIT_FTRACE_GRAPH
parents 17b2e9bf 66bb7488

Documentation/ftrace.txt→Documentation/trace/ftrace.txt

+0 −0

File moved.

View file

arch/x86/kernel/ftrace.c

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
#include <linux/init.h>

#include <linux/list.h>



#include <trace/syscall.h>



#include <asm/cacheflush.h>

#include <asm/ftrace.h>

#include <asm/nops.h>