diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-09 13:37:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-09 13:37:46 -0400 |
| commit | c2ea122cd7c4a094be71641f3961796398035513 (patch) | |
| tree | 7150db3e27a078c8a4183964a882bb15ba9f3f64 /arch/x86/kernel/ftrace.c | |
| parent | 17b2e9bf27d417bc186cc922b4d6d5eaa048f9d8 (diff) | |
| parent | 66bb74888eb4bef4ba7c87c931ecb7ecca3a240c (diff) | |
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
Diffstat (limited to 'arch/x86/kernel/ftrace.c')
| -rw-r--r-- | arch/x86/kernel/ftrace.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 70a10ca100f6..18dfa30795c9 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c | |||
| @@ -18,6 +18,8 @@ | |||
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include <linux/list.h> | 19 | #include <linux/list.h> |
| 20 | 20 | ||
| 21 | #include <trace/syscall.h> | ||
| 22 | |||
| 21 | #include <asm/cacheflush.h> | 23 | #include <asm/cacheflush.h> |
| 22 | #include <asm/ftrace.h> | 24 | #include <asm/ftrace.h> |
| 23 | #include <asm/nops.h> | 25 | #include <asm/nops.h> |