diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-04 11:15:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-04 11:15:42 +0100 |
| commit | 2602c3ba4508f528db024c1d209256513ea05de6 (patch) | |
| tree | 5713aaad7c95ca810c91fe104407a06b7e4bc4bf /kernel/trace/trace.h | |
| parent | a1be621dfacbef0fd374d8acd553d71e07bf29ac (diff) | |
| parent | 2cadf9135eb3b6d84b6427314be827ddd443c308 (diff) | |
Merge branch 'rfc/splice/tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'kernel/trace/trace.h')
| -rw-r--r-- | kernel/trace/trace.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index e606633fb498..561bb5c5d988 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -217,6 +217,7 @@ enum trace_flag_type { */ struct trace_array_cpu { atomic_t disabled; + void *buffer_page; /* ring buffer spare */ /* these fields get copied into max-trace: */ unsigned long trace_idx; |