aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.h
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/trace/trace.h')
-rw-r--r--kernel/trace/trace.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index cc1d34b8b771..5df8ff2b84a7 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -56,6 +56,8 @@ struct trace_array_cpu {
56 void *trace_current; 56 void *trace_current;
57 struct list_head trace_pages; 57 struct list_head trace_pages;
58 atomic_t disabled; 58 atomic_t disabled;
59 cycle_t time_offset;
60
59 /* these fields get copied into max-trace: */ 61 /* these fields get copied into max-trace: */
60 unsigned trace_current_idx; 62 unsigned trace_current_idx;
61 unsigned long trace_idx; 63 unsigned long trace_idx;
@@ -114,14 +116,19 @@ struct tracer {
114struct trace_iterator { 116struct trace_iterator {
115 struct trace_array *tr; 117 struct trace_array *tr;
116 struct tracer *trace; 118 struct tracer *trace;
119
117 struct trace_entry *ent; 120 struct trace_entry *ent;
121 int cpu;
122
123 struct trace_entry *prev_ent;
124 int prev_cpu;
125
118 unsigned long iter_flags; 126 unsigned long iter_flags;
119 loff_t pos; 127 loff_t pos;
120 unsigned long next_idx[NR_CPUS]; 128 unsigned long next_idx[NR_CPUS];
121 struct list_head *next_page[NR_CPUS]; 129 struct list_head *next_page[NR_CPUS];
122 unsigned next_page_idx[NR_CPUS]; 130 unsigned next_page_idx[NR_CPUS];
123 long idx; 131 long idx;
124 int cpu;
125}; 132};
126 133
127void notrace tracing_reset(struct trace_array_cpu *data); 134void notrace tracing_reset(struct trace_array_cpu *data);