Merge branches 'tracing/ftrace' and 'tracing/syscalls'; commit 'v2.6.29-rc8' into tracing/core

2009-03-13 10:23:39 +01:00
parent d2e82546ae 1b3fa2ce64
commit 62a394eb77
8 changed files with 161 additions and 3 deletions
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -31,6 +31,8 @@ enum trace_type {
 	TRACE_GRAPH_ENT,
 	TRACE_USER_STACK,
 	TRACE_HW_BRANCHES,
+	TRACE_SYSCALL_ENTER,
+	TRACE_SYSCALL_EXIT,
 	TRACE_KMEM_ALLOC,
 	TRACE_KMEM_FREE,
 	TRACE_POWER,