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 f95d65da6db8..5aec220d2de0 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -103,6 +103,11 @@ struct kretprobe_trace_entry_head {
103 unsigned long ret_ip; 103 unsigned long ret_ip;
104}; 104};
105 105
106struct uprobe_trace_entry_head {
107 struct trace_entry ent;
108 unsigned long ip;
109};
110
106/* 111/*
107 * trace_flag_type is an enumeration that holds different 112 * trace_flag_type is an enumeration that holds different
108 * states when a trace occurs. These are: 113 * states when a trace occurs. These are:
@@ -131,6 +136,7 @@ struct trace_array_cpu {
131 atomic_t disabled; 136 atomic_t disabled;
132 void *buffer_page; /* ring buffer spare */ 137 void *buffer_page; /* ring buffer spare */
133 138
139 unsigned long entries;
134 unsigned long saved_latency; 140 unsigned long saved_latency;
135 unsigned long critical_start; 141 unsigned long critical_start;
136 unsigned long critical_end; 142 unsigned long critical_end;
@@ -152,7 +158,6 @@ struct trace_array_cpu {
152 */ 158 */
153struct trace_array { 159struct trace_array {
154 struct ring_buffer *buffer; 160 struct ring_buffer *buffer;
155 unsigned long entries;
156 int cpu; 161 int cpu;
157 int buffer_disabled; 162 int buffer_disabled;
158 cycle_t time_start; 163 cycle_t time_start;
@@ -826,6 +831,8 @@ extern struct list_head ftrace_events;
826extern const char *__start___trace_bprintk_fmt[]; 831extern const char *__start___trace_bprintk_fmt[];
827extern const char *__stop___trace_bprintk_fmt[]; 832extern const char *__stop___trace_bprintk_fmt[];
828 833
834void trace_printk_init_buffers(void);
835
829#undef FTRACE_ENTRY 836#undef FTRACE_ENTRY
830#define FTRACE_ENTRY(call, struct_name, id, tstruct, print, filter) \ 837#define FTRACE_ENTRY(call, struct_name, id, tstruct, print, filter) \
831 extern struct ftrace_event_call \ 838 extern struct ftrace_event_call \