diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 05:23:39 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 05:23:39 -0400 |
| commit | 62a394eb77a1ddea73273f53ed8c3ccf6e04f2fb (patch) | |
| tree | ee72d87524b29eb9457b45e02a4587d8fbd9191d /kernel/trace/trace.h | |
| parent | d2e82546ae98eee353fae57e389f487586fe380d (diff) | |
| parent | 1b3fa2ce64363c289b3b14723cca7290bf91cfce (diff) | |
Merge branches 'tracing/ftrace' and 'tracing/syscalls'; commit 'v2.6.29-rc8' into tracing/core
Diffstat (limited to 'kernel/trace/trace.h')
| -rw-r--r-- | kernel/trace/trace.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 67595b8f0f15..56ce34d90b03 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h | |||
| @@ -31,6 +31,8 @@ enum trace_type { | |||
| 31 | TRACE_GRAPH_ENT, | 31 | TRACE_GRAPH_ENT, |
| 32 | TRACE_USER_STACK, | 32 | TRACE_USER_STACK, |
| 33 | TRACE_HW_BRANCHES, | 33 | TRACE_HW_BRANCHES, |
| 34 | TRACE_SYSCALL_ENTER, | ||
| 35 | TRACE_SYSCALL_EXIT, | ||
| 34 | TRACE_KMEM_ALLOC, | 36 | TRACE_KMEM_ALLOC, |
| 35 | TRACE_KMEM_FREE, | 37 | TRACE_KMEM_FREE, |
| 36 | TRACE_POWER, | 38 | TRACE_POWER, |