aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-06 11:39:18 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-06 11:39:18 +0100
commit16097439703bcd38e9fe5608c12add6dacb825ea (patch)
tree9f6572fefdeb3e7c61f701ed9a86979d5525ccd8 /include/linux
parent40ada30f9621fbd831ac2437b9a2a399aad34b00 (diff)
parent0012693ad4f636c720fed3802027f9427962f540 (diff)
downloadkernel_samsung_espresso10-16097439703bcd38e9fe5608c12add6dacb825ea.zip
kernel_samsung_espresso10-16097439703bcd38e9fe5608c12add6dacb825ea.tar.gz
kernel_samsung_espresso10-16097439703bcd38e9fe5608c12add6dacb825ea.tar.bz2
Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/ftrace.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 5b64303..4987694 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -1,15 +1,16 @@
#ifndef _LINUX_FTRACE_H
#define _LINUX_FTRACE_H
-#include <linux/linkage.h>
-#include <linux/fs.h>
-#include <linux/ktime.h>
-#include <linux/init.h>
-#include <linux/types.h>
-#include <linux/module.h>
+#include <linux/trace_clock.h>
#include <linux/kallsyms.h>
+#include <linux/linkage.h>
#include <linux/bitops.h>
+#include <linux/module.h>
+#include <linux/ktime.h>
#include <linux/sched.h>
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/fs.h>
#include <asm/ftrace.h>