1 files changed, 77 insertions, 202 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index fa1dccb579d5..405cb850b75d 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -7,10 +7,10 @@
 #include <linux/clocksource.h>
 #include <linux/ring_buffer.h>
 #include <linux/mmiotrace.h>
+#include <linux/tracepoint.h>
 #include <linux/ftrace.h>
 #include <trace/boot.h>
 #include <linux/kmemtrace.h>
-#include <trace/power.h>
 #include <linux/trace_seq.h>
 #include <linux/ftrace_event.h>
@@ -36,163 +36,59 @@ enum trace_type {
        TRACE_HW_BRANCHES,
        TRACE_KMEM_ALLOC,
        TRACE_KMEM_FREE,
-        TRACE_POWER,
        TRACE_BLK,
        __TRACE_LAST_TYPE,
 };
-/*
+enum kmemtrace_type_id {
- * Function trace entry - function address and parent function addres:
+        KMEMTRACE_TYPE_KMALLOC = 0,     /* kmalloc() or kfree(). */
- */
+        KMEMTRACE_TYPE_CACHE,           /* kmem_cache_*(). */
-struct ftrace_entry {
+        KMEMTRACE_TYPE_PAGES,           /* __get_free_pages() and friends. */
-        struct trace_entry      ent;
-        unsigned long           ip;
-        unsigned long           parent_ip;
-};
-/* Function call entry */
-struct ftrace_graph_ent_entry {
-        struct trace_entry              ent;
-        struct ftrace_graph_ent         graph_ent;
 };
-/* Function return entry */
-struct ftrace_graph_ret_entry {
-        struct trace_entry              ent;
-        struct ftrace_graph_ret         ret;
-};
 extern struct tracer boot_tracer;
-/*
+#undef __field
- * Context switch trace entry - which task (and prio) we switched from/to:
+#define __field(type, item)             type    item;
- */
-struct ctx_switch_entry {
-        struct trace_entry      ent;
-        unsigned int            prev_pid;
-        unsigned char           prev_prio;
-        unsigned char           prev_state;
-        unsigned int            next_pid;
-        unsigned char           next_prio;
-        unsigned char           next_state;
-        unsigned int            next_cpu;
-};
-/*
- * Special (free-form) trace entry:
- */
-struct special_entry {
-        struct trace_entry      ent;
-        unsigned long           arg1;
-        unsigned long           arg2;
-        unsigned long           arg3;
-};
-/*
- * Stack-trace entry:
- */
-#define FTRACE_STACK_ENTRIES    8
-struct stack_entry {
-        struct trace_entry      ent;
-        unsigned long           caller[FTRACE_STACK_ENTRIES];
-};
-struct userstack_entry {
-        struct trace_entry      ent;
-        unsigned long           caller[FTRACE_STACK_ENTRIES];
-};
-/*
- * trace_printk entry:
- */
-struct bprint_entry {
-        struct trace_entry      ent;
-        unsigned long           ip;
-        const char              *fmt;
-        u32                     buf[];
-};
-struct print_entry {
+#undef __field_struct
-        struct trace_entry      ent;
+#define __field_struct(type, item)      __field(type, item)
-        unsigned long           ip;
-        char                    buf[];
-};
-#define TRACE_OLD_SIZE          88
+#undef __field_desc
+#define __field_desc(type, container, item)
-struct trace_field_cont {
+#undef __array
-        unsigned char           type;
+#define __array(type, item, size)       type    item[size];
-        /* Temporary till we get rid of this completely */
-        char                    buf[TRACE_OLD_SIZE - 1];
-};
-struct trace_mmiotrace_rw {
+#undef __array_desc
-        struct trace_entry      ent;
+#define __array_desc(type, container, item, size)
-        struct mmiotrace_rw     rw;
-};
-struct trace_mmiotrace_map {
+#undef __dynamic_array
-        struct trace_entry      ent;
+#define __dynamic_array(type, item)     type    item[];
-        struct mmiotrace_map    map;
-};
-struct trace_boot_call {
+#undef F_STRUCT
-        struct trace_entry      ent;
+#define F_STRUCT(args...)               args
-        struct boot_trace_call boot_call;
-};
-struct trace_boot_ret {
+#undef FTRACE_ENTRY
-        struct trace_entry      ent;
+#define FTRACE_ENTRY(name, struct_name, id, tstruct, print)     \
-        struct boot_trace_ret boot_ret;
+        struct struct_name {                                    \
-};
+                struct trace_entry      ent;                    \
+                tstruct                                         \
-#define TRACE_FUNC_SIZE 30
+        }
-#define TRACE_FILE_SIZE 20
-struct trace_branch {
-        struct trace_entry      ent;
-        unsigned                line;
-        char                    func[TRACE_FUNC_SIZE+1];
-        char                    file[TRACE_FILE_SIZE+1];
-        char                    correct;
-};
-struct hw_branch_entry {
-        struct trace_entry      ent;
-        u64                     from;
-        u64                     to;
-};
-struct trace_power {
-        struct trace_entry      ent;
-        struct power_trace      state_data;
-};
-enum kmemtrace_type_id {
+#undef TP_ARGS
-        KMEMTRACE_TYPE_KMALLOC = 0,     /* kmalloc() or kfree(). */
+#define TP_ARGS(args...)        args
-        KMEMTRACE_TYPE_CACHE,           /* kmem_cache_*(). */
-        KMEMTRACE_TYPE_PAGES,           /* __get_free_pages() and friends. */
-};
-struct kmemtrace_alloc_entry {
+#undef FTRACE_ENTRY_DUP
-        struct trace_entry      ent;
+#define FTRACE_ENTRY_DUP(name, name_struct, id, tstruct, printk)
-        enum kmemtrace_type_id type_id;
-        unsigned long call_site;
-        const void *ptr;
-        size_t bytes_req;
-        size_t bytes_alloc;
-        gfp_t gfp_flags;
-        int node;
-};
-struct kmemtrace_free_entry {
+#include "trace_entries.h"
-        struct trace_entry      ent;
-        enum kmemtrace_type_id type_id;
-        unsigned long call_site;
-        const void *ptr;
-};
+/*
+ * syscalls are special, and need special handling, this is why
+ * they are not included in trace_entries.h
+ */
 struct syscall_trace_enter {
        struct trace_entry      ent;
        int                     nr;
@@ -205,13 +101,12 @@ struct syscall_trace_exit {
        unsigned long           ret;
 };
 /*
 * trace_flag_type is an enumeration that holds different
 * states when a trace occurs. These are:
 *  IRQS_OFF            - interrupts were disabled
 *  IRQS_NOSUPPORT      - arch does not support irqs_disabled_flags
- *  NEED_RESCED         - reschedule is requested
+ *  NEED_RESCHED        - reschedule is requested
 *  HARDIRQ             - inside an interrupt handler
 *  SOFTIRQ             - inside a softirq handler
 */
@@ -310,7 +205,6 @@ extern void __ftrace_bad_type(void);
                IF_ASSIGN(var, ent, struct ftrace_graph_ret_entry,      \
                          TRACE_GRAPH_RET);             \
                IF_ASSIGN(var, ent, struct hw_branch_entry, TRACE_HW_BRANCHES);\
-                IF_ASSIGN(var, ent, struct trace_power, TRACE_POWER); \
                IF_ASSIGN(var, ent, struct kmemtrace_alloc_entry,       \
                          TRACE_KMEM_ALLOC);    \
                IF_ASSIGN(var, ent, struct kmemtrace_free_entry,        \
@@ -390,7 +284,6 @@ struct tracer {
        struct tracer           *next;
        int                     print_max;
        struct tracer_flags     *flags;
-        struct tracer_stat      *stats;
 };
@@ -469,6 +362,7 @@ void tracing_stop_sched_switch_record(void);
 void tracing_start_sched_switch_record(void);
 int register_tracer(struct tracer *type);
 void unregister_tracer(struct tracer *type);
+int is_tracing_stopped(void);
 extern unsigned long nsecs_to_usecs(unsigned long nsecs);
@@ -509,20 +403,6 @@ static inline void __trace_stack(struct trace_array *tr, unsigned long flags,
 extern cycle_t ftrace_now(int cpu);
-#ifdef CONFIG_CONTEXT_SWITCH_TRACER
-typedef void
-(*tracer_switch_func_t)(void *private,
-                        void *__rq,
-                        struct task_struct *prev,
-                        struct task_struct *next);
-struct tracer_switch_ops {
-        tracer_switch_func_t            func;
-        void                            *private;
-        struct tracer_switch_ops        *next;
-};
-#endif /* CONFIG_CONTEXT_SWITCH_TRACER */
 extern void trace_find_cmdline(int pid, char comm[]);
 #ifdef CONFIG_DYNAMIC_FTRACE
@@ -638,6 +518,41 @@ static inline int ftrace_trace_task(struct task_struct *task)
 #endif
 /*
+ * struct trace_parser - servers for reading the user input separated by spaces
+ * @cont: set if the input is not complete - no final space char was found
+ * @buffer: holds the parsed user input
+ * @idx: user input lenght
+ * @size: buffer size
+ */
+struct trace_parser {
+        bool            cont;
+        char            *buffer;
+        unsigned        idx;
+        unsigned        size;
+};
+static inline bool trace_parser_loaded(struct trace_parser *parser)
+{
+        return (parser->idx != 0);
+}
+static inline bool trace_parser_cont(struct trace_parser *parser)
+{
+        return parser->cont;
+}
+static inline void trace_parser_clear(struct trace_parser *parser)
+{
+        parser->cont = false;
+        parser->idx = 0;
+}
+extern int trace_parser_get_init(struct trace_parser *parser, int size);
+extern void trace_parser_put(struct trace_parser *parser);
+extern int trace_get_user(struct trace_parser *parser, const char __user *ubuf,
+        size_t cnt, loff_t *ppos);
+/*
 * trace_iterator_flags is an enumeration that defines bit
 * positions into trace_flags that controls the output.
 *
@@ -823,58 +738,18 @@ filter_check_discard(struct ftrace_event_call *call, void *rec,
        return 0;
 }
-#define DEFINE_COMPARISON_PRED(type)                                    \
-static int filter_pred_##type(struct filter_pred *pred, void *event,    \
-                              int val1, int val2)                       \
-{                                                                       \
-        type *addr = (type *)(event + pred->offset);                    \
-        type val = (type)pred->val;                                     \
-        int match = 0;                                                  \
-                                                                        \
-        switch (pred->op) {                                             \
-        case OP_LT:                                                     \
-                match = (*addr < val);                                  \
-                break;                                                  \
-        case OP_LE:                                                     \
-                match = (*addr <= val);                                 \
-                break;                                                  \
-        case OP_GT:                                                     \
-                match = (*addr > val);                                  \
-                break;                                                  \
-        case OP_GE:                                                     \
-                match = (*addr >= val);                                 \
-                break;                                                  \
-        default:                                                        \
-                break;                                                  \
-        }                                                               \
-                                                                        \
-        return match;                                                   \
-}
-#define DEFINE_EQUALITY_PRED(size)                                      \
-static int filter_pred_##size(struct filter_pred *pred, void *event,    \
-                              int val1, int val2)                       \
-{                                                                       \
-        u##size *addr = (u##size *)(event + pred->offset);              \
-        u##size val = (u##size)pred->val;                               \
-        int match;                                                      \
-                                                                        \
-        match = (val == *addr) ^ pred->not;                             \
-                                                                        \
-        return match;                                                   \
-}
 extern struct mutex event_mutex;
 extern struct list_head ftrace_events;
 extern const char *__start___trace_bprintk_fmt[];
 extern const char *__stop___trace_bprintk_fmt[];
-#undef TRACE_EVENT_FORMAT
+#undef FTRACE_ENTRY
-#define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, tpfmt)      \
+#define FTRACE_ENTRY(call, struct_name, id, tstruct, print)             \
        extern struct ftrace_event_call event_##call;
-#undef TRACE_EVENT_FORMAT_NOFILTER
+#undef FTRACE_ENTRY_DUP
-#define TRACE_EVENT_FORMAT_NOFILTER(call, proto, args, fmt, tstruct, tpfmt)
+#define FTRACE_ENTRY_DUP(call, struct_name, id, tstruct, print)         \
-#include "trace_event_types.h"
+        FTRACE_ENTRY(call, struct_name, id, PARAMS(tstruct), PARAMS(print))
+#include "trace_entries.h"
 #endif /* _LINUX_KERNEL_TRACE_H */

diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index fa1dccb579d5..405cb850b75d 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h
@@ -7,10 +7,10 @@
7	#include <linux/clocksource.h>	7	#include <linux/clocksource.h>
8	#include <linux/ring_buffer.h>	8	#include <linux/ring_buffer.h>
9	#include <linux/mmiotrace.h>	9	#include <linux/mmiotrace.h>
		10	#include <linux/tracepoint.h>
10	#include <linux/ftrace.h>	11	#include <linux/ftrace.h>
11	#include <trace/boot.h>	12	#include <trace/boot.h>
12	#include <linux/kmemtrace.h>	13	#include <linux/kmemtrace.h>
13	#include <trace/power.h>
14		14
15	#include <linux/trace_seq.h>	15	#include <linux/trace_seq.h>
16	#include <linux/ftrace_event.h>	16	#include <linux/ftrace_event.h>
@@ -36,163 +36,59 @@ enum trace_type {
36	TRACE_HW_BRANCHES,	36	TRACE_HW_BRANCHES,
37	TRACE_KMEM_ALLOC,	37	TRACE_KMEM_ALLOC,
38	TRACE_KMEM_FREE,	38	TRACE_KMEM_FREE,
39	TRACE_POWER,
40	TRACE_BLK,	39	TRACE_BLK,
41		40
42	__TRACE_LAST_TYPE,	41	__TRACE_LAST_TYPE,
43	};	42	};
44		43
45	/*	44	enum kmemtrace_type_id {
46	* Function trace entry - function address and parent function addres:	45	KMEMTRACE_TYPE_KMALLOC = 0, /* kmalloc() or kfree(). */
47	*/	46	KMEMTRACE_TYPE_CACHE, /* kmem_cache_(). /
48	struct ftrace_entry {	47	KMEMTRACE_TYPE_PAGES, /* __get_free_pages() and friends. */
49	struct trace_entry ent;
50	unsigned long ip;
51	unsigned long parent_ip;
52	};
53
54	/* Function call entry */
55	struct ftrace_graph_ent_entry {
56	struct trace_entry ent;
57	struct ftrace_graph_ent graph_ent;
58	};	48	};
59		49
60	/* Function return entry */
61	struct ftrace_graph_ret_entry {
62	struct trace_entry ent;
63	struct ftrace_graph_ret ret;
64	};
65	extern struct tracer boot_tracer;	50	extern struct tracer boot_tracer;
66		51
67	/*	52	#undef __field
68	* Context switch trace entry - which task (and prio) we switched from/to:	53	#define __field(type, item) type item;
69	*/
70	struct ctx_switch_entry {
71	struct trace_entry ent;
72	unsigned int prev_pid;
73	unsigned char prev_prio;
74	unsigned char prev_state;
75	unsigned int next_pid;
76	unsigned char next_prio;
77	unsigned char next_state;
78	unsigned int next_cpu;
79	};
80
81	/*
82	* Special (free-form) trace entry:
83	*/
84	struct special_entry {
85	struct trace_entry ent;
86	unsigned long arg1;
87	unsigned long arg2;
88	unsigned long arg3;
89	};
90
91	/*
92	* Stack-trace entry:
93	*/
94
95	#define FTRACE_STACK_ENTRIES 8
96
97	struct stack_entry {
98	struct trace_entry ent;
99	unsigned long caller[FTRACE_STACK_ENTRIES];
100	};
101
102	struct userstack_entry {
103	struct trace_entry ent;
104	unsigned long caller[FTRACE_STACK_ENTRIES];
105	};
106
107	/*
108	* trace_printk entry:
109	*/
110	struct bprint_entry {
111	struct trace_entry ent;
112	unsigned long ip;
113	const char *fmt;
114	u32 buf[];
115	};
116		54
117	struct print_entry {	55	#undef __field_struct
118	struct trace_entry ent;	56	#define __field_struct(type, item) __field(type, item)
119	unsigned long ip;
120	char buf[];
121	};
122		57
123	#define TRACE_OLD_SIZE 88	58	#undef __field_desc
		59	#define __field_desc(type, container, item)
124		60
125	struct trace_field_cont {	61	#undef __array
126	unsigned char type;	62	#define __array(type, item, size) type item[size];
127	/* Temporary till we get rid of this completely */
128	char buf[TRACE_OLD_SIZE - 1];
129	};
130		63
131	struct trace_mmiotrace_rw {	64	#undef __array_desc
132	struct trace_entry ent;	65	#define __array_desc(type, container, item, size)
133	struct mmiotrace_rw rw;
134	};
135		66
136	struct trace_mmiotrace_map {	67	#undef __dynamic_array
137	struct trace_entry ent;	68	#define __dynamic_array(type, item) type item[];
138	struct mmiotrace_map map;
139	};
140		69
141	struct trace_boot_call {	70	#undef F_STRUCT
142	struct trace_entry ent;	71	#define F_STRUCT(args...) args
143	struct boot_trace_call boot_call;
144	};
145		72
146	struct trace_boot_ret {	73	#undef FTRACE_ENTRY
147	struct trace_entry ent;	74	#define FTRACE_ENTRY(name, struct_name, id, tstruct, print) \
148	struct boot_trace_ret boot_ret;	75	struct struct_name { \
149	};	76	struct trace_entry ent; \
150		77	tstruct \
151	#define TRACE_FUNC_SIZE 30	78	}
152	#define TRACE_FILE_SIZE 20
153	struct trace_branch {
154	struct trace_entry ent;
155	unsigned line;
156	char func[TRACE_FUNC_SIZE+1];
157	char file[TRACE_FILE_SIZE+1];
158	char correct;
159	};
160
161	struct hw_branch_entry {
162	struct trace_entry ent;
163	u64 from;
164	u64 to;
165	};
166
167	struct trace_power {
168	struct trace_entry ent;
169	struct power_trace state_data;
170	};
171		79
172	enum kmemtrace_type_id {	80	#undef TP_ARGS
173	KMEMTRACE_TYPE_KMALLOC = 0, /* kmalloc() or kfree(). */	81	#define TP_ARGS(args...) args
174	KMEMTRACE_TYPE_CACHE, /* kmem_cache_(). /
175	KMEMTRACE_TYPE_PAGES, /* __get_free_pages() and friends. */
176	};
177		82
178	struct kmemtrace_alloc_entry {	83	#undef FTRACE_ENTRY_DUP
179	struct trace_entry ent;	84	#define FTRACE_ENTRY_DUP(name, name_struct, id, tstruct, printk)
180	enum kmemtrace_type_id type_id;
181	unsigned long call_site;
182	const void *ptr;
183	size_t bytes_req;
184	size_t bytes_alloc;
185	gfp_t gfp_flags;
186	int node;
187	};
188		85
189	struct kmemtrace_free_entry {	86	#include "trace_entries.h"
190	struct trace_entry ent;
191	enum kmemtrace_type_id type_id;
192	unsigned long call_site;
193	const void *ptr;
194	};
195		87
		88	/*
		89	* syscalls are special, and need special handling, this is why
		90	* they are not included in trace_entries.h
		91	*/
196	struct syscall_trace_enter {	92	struct syscall_trace_enter {
197	struct trace_entry ent;	93	struct trace_entry ent;
198	int nr;	94	int nr;
@@ -205,13 +101,12 @@ struct syscall_trace_exit {
205	unsigned long ret;	101	unsigned long ret;
206	};	102	};
207		103
208
209	/*	104	/*
210	* trace_flag_type is an enumeration that holds different	105	* trace_flag_type is an enumeration that holds different
211	* states when a trace occurs. These are:	106	* states when a trace occurs. These are:
212	* IRQS_OFF - interrupts were disabled	107	* IRQS_OFF - interrupts were disabled
213	* IRQS_NOSUPPORT - arch does not support irqs_disabled_flags	108	* IRQS_NOSUPPORT - arch does not support irqs_disabled_flags
214	* NEED_RESCED - reschedule is requested	109	* NEED_RESCHED - reschedule is requested
215	* HARDIRQ - inside an interrupt handler	110	* HARDIRQ - inside an interrupt handler
216	* SOFTIRQ - inside a softirq handler	111	* SOFTIRQ - inside a softirq handler
217	*/	112	*/
@@ -310,7 +205,6 @@ extern void __ftrace_bad_type(void);
310	IF_ASSIGN(var, ent, struct ftrace_graph_ret_entry, \	205	IF_ASSIGN(var, ent, struct ftrace_graph_ret_entry, \
311	TRACE_GRAPH_RET); \	206	TRACE_GRAPH_RET); \
312	IF_ASSIGN(var, ent, struct hw_branch_entry, TRACE_HW_BRANCHES);\	207	IF_ASSIGN(var, ent, struct hw_branch_entry, TRACE_HW_BRANCHES);\
313	IF_ASSIGN(var, ent, struct trace_power, TRACE_POWER); \
314	IF_ASSIGN(var, ent, struct kmemtrace_alloc_entry, \	208	IF_ASSIGN(var, ent, struct kmemtrace_alloc_entry, \
315	TRACE_KMEM_ALLOC); \	209	TRACE_KMEM_ALLOC); \
316	IF_ASSIGN(var, ent, struct kmemtrace_free_entry, \	210	IF_ASSIGN(var, ent, struct kmemtrace_free_entry, \
@@ -390,7 +284,6 @@ struct tracer {
390	struct tracer *next;	284	struct tracer *next;
391	int print_max;	285	int print_max;
392	struct tracer_flags *flags;	286	struct tracer_flags *flags;
393	struct tracer_stat *stats;
394	};	287	};
395		288
396		289
@@ -469,6 +362,7 @@ void tracing_stop_sched_switch_record(void);
469	void tracing_start_sched_switch_record(void);	362	void tracing_start_sched_switch_record(void);
470	int register_tracer(struct tracer *type);	363	int register_tracer(struct tracer *type);
471	void unregister_tracer(struct tracer *type);	364	void unregister_tracer(struct tracer *type);
		365	int is_tracing_stopped(void);
472		366
473	extern unsigned long nsecs_to_usecs(unsigned long nsecs);	367	extern unsigned long nsecs_to_usecs(unsigned long nsecs);
474		368
@@ -509,20 +403,6 @@ static inline void __trace_stack(struct trace_array *tr, unsigned long flags,
509		403
510	extern cycle_t ftrace_now(int cpu);	404	extern cycle_t ftrace_now(int cpu);
511		405
512	#ifdef CONFIG_CONTEXT_SWITCH_TRACER
513	typedef void
514	(tracer_switch_func_t)(void private,
515	void *__rq,
516	struct task_struct *prev,
517	struct task_struct *next);
518
519	struct tracer_switch_ops {
520	tracer_switch_func_t func;
521	void *private;
522	struct tracer_switch_ops *next;
523	};
524	#endif /* CONFIG_CONTEXT_SWITCH_TRACER */
525
526	extern void trace_find_cmdline(int pid, char comm[]);	406	extern void trace_find_cmdline(int pid, char comm[]);
527		407
528	#ifdef CONFIG_DYNAMIC_FTRACE	408	#ifdef CONFIG_DYNAMIC_FTRACE
@@ -638,6 +518,41 @@ static inline int ftrace_trace_task(struct task_struct *task)
638	#endif	518	#endif
639		519
640	/*	520	/*
		521	* struct trace_parser - servers for reading the user input separated by spaces
		522	* @cont: set if the input is not complete - no final space char was found
		523	* @buffer: holds the parsed user input
		524	* @idx: user input lenght
		525	* @size: buffer size
		526	*/
		527	struct trace_parser {
		528	bool cont;
		529	char *buffer;
		530	unsigned idx;
		531	unsigned size;
		532	};
		533
		534	static inline bool trace_parser_loaded(struct trace_parser *parser)
		535	{
		536	return (parser->idx != 0);
		537	}
		538
		539	static inline bool trace_parser_cont(struct trace_parser *parser)
		540	{
		541	return parser->cont;
		542	}
		543
		544	static inline void trace_parser_clear(struct trace_parser *parser)
		545	{
		546	parser->cont = false;
		547	parser->idx = 0;
		548	}
		549
		550	extern int trace_parser_get_init(struct trace_parser *parser, int size);
		551	extern void trace_parser_put(struct trace_parser *parser);
		552	extern int trace_get_user(struct trace_parser parser, const char __user ubuf,
		553	size_t cnt, loff_t *ppos);
		554
		555	/*
641	* trace_iterator_flags is an enumeration that defines bit	556	* trace_iterator_flags is an enumeration that defines bit
642	* positions into trace_flags that controls the output.	557	* positions into trace_flags that controls the output.
643	*	558	*
@@ -823,58 +738,18 @@ filter_check_discard(struct ftrace_event_call call, void rec,
823	return 0;	738	return 0;
824	}	739	}
825		740
826	#define DEFINE_COMPARISON_PRED(type) \
827	static int filter_pred_##type(struct filter_pred pred, void event, \
828	int val1, int val2) \
829	{ \
830	type addr = (type )(event + pred->offset); \
831	type val = (type)pred->val; \
832	int match = 0; \
833	\
834	switch (pred->op) { \
835	case OP_LT: \
836	match = (*addr < val); \
837	break; \
838	case OP_LE: \
839	match = (*addr <= val); \
840	break; \
841	case OP_GT: \
842	match = (*addr > val); \
843	break; \
844	case OP_GE: \
845	match = (*addr >= val); \
846	break; \
847	default: \
848	break; \
849	} \
850	\
851	return match; \
852	}
853
854	#define DEFINE_EQUALITY_PRED(size) \
855	static int filter_pred_##size(struct filter_pred pred, void event, \
856	int val1, int val2) \
857	{ \
858	u##size addr = (u##size )(event + pred->offset); \
859	u##size val = (u##size)pred->val; \
860	int match; \
861	\
862	match = (val == *addr) ^ pred->not; \
863	\
864	return match; \
865	}
866
867	extern struct mutex event_mutex;	741	extern struct mutex event_mutex;
868	extern struct list_head ftrace_events;	742	extern struct list_head ftrace_events;
869		743
870	extern const char *__start___trace_bprintk_fmt[];	744	extern const char *__start___trace_bprintk_fmt[];
871	extern const char *__stop___trace_bprintk_fmt[];	745	extern const char *__stop___trace_bprintk_fmt[];
872		746
873	#undef TRACE_EVENT_FORMAT	747	#undef FTRACE_ENTRY
874	#define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, tpfmt) \	748	#define FTRACE_ENTRY(call, struct_name, id, tstruct, print) \
875	extern struct ftrace_event_call event_##call;	749	extern struct ftrace_event_call event_##call;
876	#undef TRACE_EVENT_FORMAT_NOFILTER	750	#undef FTRACE_ENTRY_DUP
877	#define TRACE_EVENT_FORMAT_NOFILTER(call, proto, args, fmt, tstruct, tpfmt)	751	#define FTRACE_ENTRY_DUP(call, struct_name, id, tstruct, print) \
878	#include "trace_event_types.h"	752	FTRACE_ENTRY(call, struct_name, id, PARAMS(tstruct), PARAMS(print))
		753	#include "trace_entries.h"
879		754
880	#endif /* _LINUX_KERNEL_TRACE_H */	755	#endif /* _LINUX_KERNEL_TRACE_H */