1 files changed, 13 insertions, 4 deletions

diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 38276d1638e3..7cfb741be200 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -123,7 +123,6 @@ struct userstack_entry {
 struct bprint_entry {
         struct trace_entry      ent;
         unsigned long           ip;
-        int                     depth;
         const char              *fmt;
         u32                     buf[];
 };
@@ -131,7 +130,6 @@ struct bprint_entry {
 struct print_entry {
         struct trace_entry      ent;
         unsigned long           ip;
-        int                     depth;
         char                    buf[];
 };
 
@@ -598,9 +596,9 @@ extern int trace_selftest_startup_branch(struct tracer *trace,
 extern void *head_page(struct trace_array_cpu *data);
 extern long ns2usecs(cycle_t nsec);
 extern int
-trace_vbprintk(unsigned long ip, int depth, const char *fmt, va_list args);
+trace_vbprintk(unsigned long ip, const char *fmt, va_list args);
 extern int
-trace_vprintk(unsigned long ip, int depth, const char *fmt, va_list args);
+trace_vprintk(unsigned long ip, const char *fmt, va_list args);
 
 extern unsigned long trace_flags;
 
@@ -787,12 +785,23 @@ struct ftrace_event_call {
         int             id;
         int             (*raw_init)(void);
         int             (*show_format)(struct trace_seq *s);
+
+#ifdef CONFIG_EVENT_PROFILE
+        atomic_t        profile_count;
+        int             (*profile_enable)(struct ftrace_event_call *);
+        void            (*profile_disable)(struct ftrace_event_call *);
+#endif
 };
 
 void event_trace_printk(unsigned long ip, const char *fmt, ...);
 extern struct ftrace_event_call __start_ftrace_events[];
 extern struct ftrace_event_call __stop_ftrace_events[];
 
+#define for_each_event(event)                                           \
+        for (event = __start_ftrace_events;                             \
+             (unsigned long)event < (unsigned long)__stop_ftrace_events; \
+             event++)
+
 extern const char *__start___trace_bprintk_fmt[];
 extern const char *__stop___trace_bprintk_fmt[];