Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f1d2f82 authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

tracing: Rename ftrace_event_file to trace_event_file 



The name "ftrace" really refers to the function hook infrastructure. It
is not about the trace_events. The structure ftrace_event_file is really
about trace events and not "ftrace". Rename it to trace_event_file.

Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 9023c930

include/linux/trace_events.h

+12 −12
Original line number Diff line number Diff line
@@ -157,11 +157,11 @@ static inline enum print_line_t trace_handle_return(struct trace_seq *s) 
void tracing_generic_entry_update(struct trace_entry *entry,

				  unsigned long flags,

				  int pc);

struct ftrace_event_file;

struct trace_event_file;



struct ring_buffer_event *

trace_event_buffer_lock_reserve(struct ring_buffer **current_buffer,

				struct ftrace_event_file *ftrace_file,

				struct trace_event_file *trace_file,

				int type, unsigned long len,

				unsigned long flags, int pc);

struct ring_buffer_event *
@@ -222,14 +222,14 @@ extern int trace_event_reg(struct ftrace_event_call *event, 
struct ftrace_event_buffer {

	struct ring_buffer		*buffer;

	struct ring_buffer_event	*event;

	struct ftrace_event_file	*ftrace_file;

	struct trace_event_file		*trace_file;

	void				*entry;

	unsigned long			flags;

	int				pc;

};



void *ftrace_event_buffer_reserve(struct ftrace_event_buffer *fbuffer,

				  struct ftrace_event_file *ftrace_file,

				  struct trace_event_file *trace_file,

				  unsigned long len);



void ftrace_event_buffer_commit(struct ftrace_event_buffer *fbuffer);
@@ -349,7 +349,7 @@ enum { 
	FTRACE_EVENT_FL_TRIGGER_COND	= (1 << FTRACE_EVENT_FL_TRIGGER_COND_BIT),

};



struct ftrace_event_file {

struct trace_event_file {

	struct list_head		list;

	struct ftrace_event_call	*event_call;

	struct event_filter		*filter;
@@ -414,15 +414,15 @@ enum event_trigger_type { 


extern int filter_match_preds(struct event_filter *filter, void *rec);



extern int filter_check_discard(struct ftrace_event_file *file, void *rec,

extern int filter_check_discard(struct trace_event_file *file, void *rec,

				struct ring_buffer *buffer,

				struct ring_buffer_event *event);

extern int call_filter_check_discard(struct ftrace_event_call *call, void *rec,

				     struct ring_buffer *buffer,

				     struct ring_buffer_event *event);

extern enum event_trigger_type event_triggers_call(struct ftrace_event_file *file,

extern enum event_trigger_type event_triggers_call(struct trace_event_file *file,

						   void *rec);

extern void event_triggers_post_call(struct ftrace_event_file *file,

extern void event_triggers_post_call(struct trace_event_file *file,

				     enum event_trigger_type tt);



/**
@@ -435,7 +435,7 @@ extern void event_triggers_post_call(struct ftrace_event_file *file, 
 * otherwise false.

 */

static inline bool

ftrace_trigger_soft_disabled(struct ftrace_event_file *file)

ftrace_trigger_soft_disabled(struct trace_event_file *file)

{

	unsigned long eflags = file->flags;
@@ -462,7 +462,7 @@ ftrace_trigger_soft_disabled(struct ftrace_event_file *file) 
 * Returns true if the event is discarded, false otherwise.

 */

static inline bool

__event_trigger_test_discard(struct ftrace_event_file *file,

__event_trigger_test_discard(struct trace_event_file *file,

			     struct ring_buffer *buffer,

			     struct ring_buffer_event *event,

			     void *entry,
@@ -495,7 +495,7 @@ __event_trigger_test_discard(struct ftrace_event_file *file, 
 * if the event is soft disabled and should be discarded.

 */

static inline void

event_trigger_unlock_commit(struct ftrace_event_file *file,

event_trigger_unlock_commit(struct trace_event_file *file,

			    struct ring_buffer *buffer,

			    struct ring_buffer_event *event,

			    void *entry, unsigned long irq_flags, int pc)
@@ -526,7 +526,7 @@ event_trigger_unlock_commit(struct ftrace_event_file *file, 
 * trace_buffer_unlock_commit_regs() instead of trace_buffer_unlock_commit().

 */

static inline void

event_trigger_unlock_commit_regs(struct ftrace_event_file *file,

event_trigger_unlock_commit_regs(struct trace_event_file *file,

				 struct ring_buffer *buffer,

				 struct ring_buffer_event *event,

				 void *entry, unsigned long irq_flags, int pc,

include/trace/perf.h

+12 −12
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@ 
 *

 * static void ftrace_raw_event_<call>(void *__data, proto)

 * {

 *	struct ftrace_event_file *ftrace_file = __data;

 *	struct ftrace_event_call *event_call = ftrace_file->event_call;

 *	struct trace_event_file *trace_file = __data;

 *	struct ftrace_event_call *event_call = trace_file->event_call;

 *	struct ftrace_data_offsets_<call> __maybe_unused __data_offsets;

 *	unsigned long eflags = ftrace_file->flags;

 *	unsigned long eflags = trace_file->flags;

 *	enum event_trigger_type __tt = ETT_NONE;

 *	struct ring_buffer_event *event;

 *	struct ftrace_raw_<call> *entry; <-- defined in stage 1
@@ -23,7 +23,7 @@ 
 *

 *	if (!(eflags & FTRACE_EVENT_FL_TRIGGER_COND)) {

 *		if (eflags & FTRACE_EVENT_FL_TRIGGER_MODE)

 *			event_triggers_call(ftrace_file, NULL);

 *			event_triggers_call(trace_file, NULL);

 *		if (eflags & FTRACE_EVENT_FL_SOFT_DISABLED)

 *			return;

 *	}
@@ -33,7 +33,7 @@ 
 *

 *	__data_size = ftrace_get_offsets_<call>(&__data_offsets, args);

 *

 *	event = trace_event_buffer_lock_reserve(&buffer, ftrace_file,

 *	event = trace_event_buffer_lock_reserve(&buffer, trace_file,

 *				  event_<call>->event.type,

 *				  sizeof(*entry) + __data_size,

 *				  irq_flags, pc);
@@ -45,16 +45,16 @@ 
 *			   __array macros.

 *

 *	if (eflags & FTRACE_EVENT_FL_TRIGGER_COND)

 *		__tt = event_triggers_call(ftrace_file, entry);

 *		__tt = event_triggers_call(trace_file, entry);

 *

 *	if (test_bit(FTRACE_EVENT_FL_SOFT_DISABLED_BIT,

 *		     &ftrace_file->flags))

 *		     &trace_file->flags))

 *		ring_buffer_discard_commit(buffer, event);

 *	else if (!filter_check_discard(ftrace_file, entry, buffer, event))

 *	else if (!filter_check_discard(trace_file, entry, buffer, event))

 *		trace_buffer_unlock_commit(buffer, event, irq_flags, pc);

 *

 *	if (__tt)

 *		event_triggers_post_call(ftrace_file, __tt);

 *		event_triggers_post_call(trace_file, __tt);

 * }

 *

 * static struct trace_event ftrace_event_type_<call> = {
@@ -153,18 +153,18 @@ 
static notrace void							\

ftrace_raw_event_##call(void *__data, proto)				\

{									\

	struct ftrace_event_file *ftrace_file = __data;			\

	struct trace_event_file *trace_file = __data;			\

	struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\

	struct ftrace_event_buffer fbuffer;				\

	struct ftrace_raw_##call *entry;				\

	int __data_size;						\

									\

	if (ftrace_trigger_soft_disabled(ftrace_file))			\

	if (ftrace_trigger_soft_disabled(trace_file))			\

		return;							\

									\

	__data_size = ftrace_get_offsets_##call(&__data_offsets, args); \

									\

	entry = ftrace_event_buffer_reserve(&fbuffer, ftrace_file,	\

	entry = ftrace_event_buffer_reserve(&fbuffer, trace_file,	\

				 sizeof(*entry) + __data_size);		\

									\

	if (!entry)							\

kernel/trace/trace.c

+4 −4
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ void trace_array_put(struct trace_array *this_tr) 
	mutex_unlock(&trace_types_lock);

}



int filter_check_discard(struct ftrace_event_file *file, void *rec,

int filter_check_discard(struct trace_event_file *file, void *rec,

			 struct ring_buffer *buffer,

			 struct ring_buffer_event *event)

{
@@ -1694,13 +1694,13 @@ static struct ring_buffer *temp_buffer; 


struct ring_buffer_event *

trace_event_buffer_lock_reserve(struct ring_buffer **current_rb,

			  struct ftrace_event_file *ftrace_file,

			  struct trace_event_file *trace_file,

			  int type, unsigned long len,

			  unsigned long flags, int pc)

{

	struct ring_buffer_event *entry;



	*current_rb = ftrace_file->tr->trace_buffer.buffer;

	*current_rb = trace_file->tr->trace_buffer.buffer;

	entry = trace_buffer_lock_reserve(*current_rb,

					 type, len, flags, pc);

	/*
@@ -1709,7 +1709,7 @@ trace_event_buffer_lock_reserve(struct ring_buffer **current_rb, 
	 * to store the trace event for the tigger to use. It's recusive

	 * safe and will not be recorded anywhere.

	 */

	if (!entry && ftrace_file->flags & FTRACE_EVENT_FL_TRIGGER_COND) {

	if (!entry && trace_file->flags & FTRACE_EVENT_FL_TRIGGER_COND) {

		*current_rb = temp_buffer;

		entry = trace_buffer_lock_reserve(*current_rb,

						  type, len, flags, pc);

kernel/trace/trace.h

+12 −12
Original line number Diff line number Diff line
@@ -211,8 +211,8 @@ struct trace_array { 
#ifdef CONFIG_FTRACE_SYSCALLS

	int			sys_refcount_enter;

	int			sys_refcount_exit;

	struct ftrace_event_file __rcu *enter_syscall_files[NR_syscalls];

	struct ftrace_event_file __rcu *exit_syscall_files[NR_syscalls];

	struct trace_event_file __rcu *enter_syscall_files[NR_syscalls];

	struct trace_event_file __rcu *exit_syscall_files[NR_syscalls];

#endif

	int			stop_count;

	int			clock_id;
@@ -1052,9 +1052,9 @@ struct filter_pred { 


extern enum regex_type

filter_parse_regex(char *buff, int len, char **search, int *not);

extern void print_event_filter(struct ftrace_event_file *file,

extern void print_event_filter(struct trace_event_file *file,

			       struct trace_seq *s);

extern int apply_event_filter(struct ftrace_event_file *file,

extern int apply_event_filter(struct trace_event_file *file,

			      char *filter_string);

extern int apply_subsystem_event_filter(struct ftrace_subsystem_dir *dir,

					char *filter_string);
@@ -1073,7 +1073,7 @@ extern void trace_event_enable_cmd_record(bool enable); 
extern int event_trace_add_tracer(struct dentry *parent, struct trace_array *tr);

extern int event_trace_del_tracer(struct trace_array *tr);



extern struct ftrace_event_file *find_event_file(struct trace_array *tr,

extern struct trace_event_file *find_event_file(struct trace_array *tr,

						const char *system,

						const char *event);
@@ -1242,23 +1242,23 @@ struct event_command { 
	enum event_trigger_type	trigger_type;

	bool			post_trigger;

	int			(*func)(struct event_command *cmd_ops,

					struct ftrace_event_file *file,

					struct trace_event_file *file,

					char *glob, char *cmd, char *params);

	int			(*reg)(char *glob,

				       struct event_trigger_ops *ops,

				       struct event_trigger_data *data,

				       struct ftrace_event_file *file);

				       struct trace_event_file *file);

	void			(*unreg)(char *glob,

					 struct event_trigger_ops *ops,

					 struct event_trigger_data *data,

					 struct ftrace_event_file *file);

					 struct trace_event_file *file);

	int			(*set_filter)(char *filter_str,

					      struct event_trigger_data *data,

					      struct ftrace_event_file *file);

					      struct trace_event_file *file);

	struct event_trigger_ops *(*get_trigger_ops)(char *cmd, char *param);

};



extern int trace_event_enable_disable(struct ftrace_event_file *file,

extern int trace_event_enable_disable(struct trace_event_file *file,

				      int enable, int soft_disable);

extern int tracing_alloc_snapshot(void);

kernel/trace/trace_events.c

+46 −46
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static int system_refcount_dec(struct event_subsystem *system) 


#define do_for_each_event_file_safe(tr, file)			\

	list_for_each_entry(tr, &ftrace_trace_arrays, list) {	\

		struct ftrace_event_file *___n;				\

		struct trace_event_file *___n;				\

		list_for_each_entry_safe(file, ___n, &tr->events, list)



#define while_for_each_event_file()		\
@@ -191,17 +191,17 @@ int trace_event_raw_init(struct ftrace_event_call *call) 
EXPORT_SYMBOL_GPL(trace_event_raw_init);



void *ftrace_event_buffer_reserve(struct ftrace_event_buffer *fbuffer,

				  struct ftrace_event_file *ftrace_file,

				  struct trace_event_file *trace_file,

				  unsigned long len)

{

	struct ftrace_event_call *event_call = ftrace_file->event_call;

	struct ftrace_event_call *event_call = trace_file->event_call;



	local_save_flags(fbuffer->flags);

	fbuffer->pc = preempt_count();

	fbuffer->ftrace_file = ftrace_file;

	fbuffer->trace_file = trace_file;



	fbuffer->event =

		trace_event_buffer_lock_reserve(&fbuffer->buffer, ftrace_file,

		trace_event_buffer_lock_reserve(&fbuffer->buffer, trace_file,

						event_call->event.type, len,

						fbuffer->flags, fbuffer->pc);

	if (!fbuffer->event)
@@ -224,12 +224,12 @@ static void output_printk(struct ftrace_event_buffer *fbuffer) 
	if (!iter)

		return;



	event_call = fbuffer->ftrace_file->event_call;

	event_call = fbuffer->trace_file->event_call;

	if (!event_call || !event_call->event.funcs ||

	    !event_call->event.funcs->trace)

		return;



	event = &fbuffer->ftrace_file->event_call->event;

	event = &fbuffer->trace_file->event_call->event;



	spin_lock_irqsave(&tracepoint_iter_lock, flags);

	trace_seq_init(&iter->seq);
@@ -246,7 +246,7 @@ void ftrace_event_buffer_commit(struct ftrace_event_buffer *fbuffer) 
	if (tracepoint_printk)

		output_printk(fbuffer);



	event_trigger_unlock_commit(fbuffer->ftrace_file, fbuffer->buffer,

	event_trigger_unlock_commit(fbuffer->trace_file, fbuffer->buffer,

				    fbuffer->event, fbuffer->entry,

				    fbuffer->flags, fbuffer->pc);

}
@@ -255,7 +255,7 @@ EXPORT_SYMBOL_GPL(ftrace_event_buffer_commit); 
int trace_event_reg(struct ftrace_event_call *call,

		    enum trace_reg type, void *data)

{

	struct ftrace_event_file *file = data;

	struct trace_event_file *file = data;



	WARN_ON(!(call->flags & TRACE_EVENT_FL_TRACEPOINT));

	switch (type) {
@@ -292,7 +292,7 @@ EXPORT_SYMBOL_GPL(trace_event_reg); 


void trace_event_enable_cmd_record(bool enable)

{

	struct ftrace_event_file *file;

	struct trace_event_file *file;

	struct trace_array *tr;



	mutex_lock(&event_mutex);
@@ -312,7 +312,7 @@ void trace_event_enable_cmd_record(bool enable) 
	mutex_unlock(&event_mutex);

}



static int __ftrace_event_enable_disable(struct ftrace_event_file *file,

static int __ftrace_event_enable_disable(struct trace_event_file *file,

					 int enable, int soft_disable)

{

	struct ftrace_event_call *call = file->event_call;
@@ -401,13 +401,13 @@ static int __ftrace_event_enable_disable(struct ftrace_event_file *file, 
	return ret;

}



int trace_event_enable_disable(struct ftrace_event_file *file,

int trace_event_enable_disable(struct trace_event_file *file,

			       int enable, int soft_disable)

{

	return __ftrace_event_enable_disable(file, enable, soft_disable);

}



static int ftrace_event_enable_disable(struct ftrace_event_file *file,

static int ftrace_event_enable_disable(struct trace_event_file *file,

				       int enable)

{

	return __ftrace_event_enable_disable(file, enable, 0);
@@ -415,7 +415,7 @@ static int ftrace_event_enable_disable(struct ftrace_event_file *file, 


static void ftrace_clear_events(struct trace_array *tr)

{

	struct ftrace_event_file *file;

	struct trace_event_file *file;



	mutex_lock(&event_mutex);

	list_for_each_entry(file, &tr->events, list) {
@@ -486,7 +486,7 @@ static void remove_subsystem(struct ftrace_subsystem_dir *dir) 
	}

}



static void remove_event_file_dir(struct ftrace_event_file *file)

static void remove_event_file_dir(struct trace_event_file *file)

{

	struct dentry *dir = file->dir;

	struct dentry *child;
@@ -515,7 +515,7 @@ static int 
__ftrace_set_clr_event_nolock(struct trace_array *tr, const char *match,

			      const char *sub, const char *event, int set)

{

	struct ftrace_event_file *file;

	struct trace_event_file *file;

	struct ftrace_event_call *call;

	const char *name;

	int ret = -EINVAL;
@@ -671,7 +671,7 @@ ftrace_event_write(struct file *file, const char __user *ubuf, 
static void *

t_next(struct seq_file *m, void *v, loff_t *pos)

{

	struct ftrace_event_file *file = v;

	struct trace_event_file *file = v;

	struct ftrace_event_call *call;

	struct trace_array *tr = m->private;
@@ -692,13 +692,13 @@ t_next(struct seq_file *m, void *v, loff_t *pos) 


static void *t_start(struct seq_file *m, loff_t *pos)

{

	struct ftrace_event_file *file;

	struct trace_event_file *file;

	struct trace_array *tr = m->private;

	loff_t l;



	mutex_lock(&event_mutex);



	file = list_entry(&tr->events, struct ftrace_event_file, list);

	file = list_entry(&tr->events, struct trace_event_file, list);

	for (l = 0; l <= *pos; ) {

		file = t_next(m, file, &l);

		if (!file)
@@ -710,7 +710,7 @@ static void *t_start(struct seq_file *m, loff_t *pos) 
static void *

s_next(struct seq_file *m, void *v, loff_t *pos)

{

	struct ftrace_event_file *file = v;

	struct trace_event_file *file = v;

	struct trace_array *tr = m->private;



	(*pos)++;
@@ -725,13 +725,13 @@ s_next(struct seq_file *m, void *v, loff_t *pos) 


static void *s_start(struct seq_file *m, loff_t *pos)

{

	struct ftrace_event_file *file;

	struct trace_event_file *file;

	struct trace_array *tr = m->private;

	loff_t l;



	mutex_lock(&event_mutex);



	file = list_entry(&tr->events, struct ftrace_event_file, list);

	file = list_entry(&tr->events, struct trace_event_file, list);

	for (l = 0; l <= *pos; ) {

		file = s_next(m, file, &l);

		if (!file)
@@ -742,7 +742,7 @@ static void *s_start(struct seq_file *m, loff_t *pos) 


static int t_show(struct seq_file *m, void *v)

{

	struct ftrace_event_file *file = v;

	struct trace_event_file *file = v;

	struct ftrace_event_call *call = file->event_call;



	if (strcmp(call->class->system, TRACE_SYSTEM) != 0)
@@ -761,7 +761,7 @@ static ssize_t 
event_enable_read(struct file *filp, char __user *ubuf, size_t cnt,

		  loff_t *ppos)

{

	struct ftrace_event_file *file;

	struct trace_event_file *file;

	unsigned long flags;

	char buf[4] = "0";
@@ -791,7 +791,7 @@ static ssize_t 
event_enable_write(struct file *filp, const char __user *ubuf, size_t cnt,

		   loff_t *ppos)

{

	struct ftrace_event_file *file;

	struct trace_event_file *file;

	unsigned long val;

	int ret;
@@ -831,7 +831,7 @@ system_enable_read(struct file *filp, char __user *ubuf, size_t cnt, 
	struct ftrace_subsystem_dir *dir = filp->private_data;

	struct event_subsystem *system = dir->subsystem;

	struct ftrace_event_call *call;

	struct ftrace_event_file *file;

	struct trace_event_file *file;

	struct trace_array *tr = dir->tr;

	char buf[2];

	int set = 0;
@@ -1062,7 +1062,7 @@ static ssize_t 
event_filter_read(struct file *filp, char __user *ubuf, size_t cnt,

		  loff_t *ppos)

{

	struct ftrace_event_file *file;

	struct trace_event_file *file;

	struct trace_seq *s;

	int r = -ENODEV;
@@ -1095,7 +1095,7 @@ static ssize_t 
event_filter_write(struct file *filp, const char __user *ubuf, size_t cnt,

		   loff_t *ppos)

{

	struct ftrace_event_file *file;

	struct trace_event_file *file;

	char *buf;

	int err = -ENODEV;
@@ -1497,7 +1497,7 @@ create_new_subsystem(const char *name) 


static struct dentry *

event_subsystem_dir(struct trace_array *tr, const char *name,

		    struct ftrace_event_file *file, struct dentry *parent)

		    struct trace_event_file *file, struct dentry *parent)

{

	struct ftrace_subsystem_dir *dir;

	struct event_subsystem *system;
@@ -1571,7 +1571,7 @@ event_subsystem_dir(struct trace_array *tr, const char *name, 
}



static int

event_create_dir(struct dentry *parent, struct ftrace_event_file *file)

event_create_dir(struct dentry *parent, struct trace_event_file *file)

{

	struct ftrace_event_call *call = file->event_call;

	struct trace_array *tr = file->tr;
@@ -1636,7 +1636,7 @@ event_create_dir(struct dentry *parent, struct ftrace_event_file *file) 


static void remove_event_from_tracers(struct ftrace_event_call *call)

{

	struct ftrace_event_file *file;

	struct trace_event_file *file;

	struct trace_array *tr;



	do_for_each_event_file_safe(tr, file) {
@@ -1657,7 +1657,7 @@ static void remove_event_from_tracers(struct ftrace_event_call *call) 
static void event_remove(struct ftrace_event_call *call)

{

	struct trace_array *tr;

	struct ftrace_event_file *file;

	struct trace_event_file *file;



	do_for_each_event_file(tr, file) {

		if (file->event_call != call)
@@ -1836,11 +1836,11 @@ void trace_event_enum_update(struct trace_enum_map **map, int len) 
	up_write(&trace_event_sem);

}



static struct ftrace_event_file *

static struct trace_event_file *

trace_create_new_event(struct ftrace_event_call *call,

		       struct trace_array *tr)

{

	struct ftrace_event_file *file;

	struct trace_event_file *file;



	file = kmem_cache_alloc(file_cachep, GFP_TRACE);

	if (!file)
@@ -1860,7 +1860,7 @@ trace_create_new_event(struct ftrace_event_call *call, 
static int

__trace_add_new_event(struct ftrace_event_call *call, struct trace_array *tr)

{

	struct ftrace_event_file *file;

	struct trace_event_file *file;



	file = trace_create_new_event(call, tr);

	if (!file)
@@ -1878,7 +1878,7 @@ static __init int 
__trace_early_add_new_event(struct ftrace_event_call *call,

			    struct trace_array *tr)

{

	struct ftrace_event_file *file;

	struct trace_event_file *file;



	file = trace_create_new_event(call, tr);

	if (!file)
@@ -1921,7 +1921,7 @@ static void __trace_remove_event_call(struct ftrace_event_call *call) 
static int probe_remove_event_call(struct ftrace_event_call *call)

{

	struct trace_array *tr;

	struct ftrace_event_file *file;

	struct trace_event_file *file;



#ifdef CONFIG_PERF_EVENTS

	if (call->perf_refcount)
@@ -2066,10 +2066,10 @@ __trace_add_event_dirs(struct trace_array *tr) 
	}

}



struct ftrace_event_file *

struct trace_event_file *

find_event_file(struct trace_array *tr, const char *system,  const char *event)

{

	struct ftrace_event_file *file;

	struct trace_event_file *file;

	struct ftrace_event_call *call;

	const char *name;
@@ -2098,7 +2098,7 @@ find_event_file(struct trace_array *tr, const char *system, const char *event) 
#define DISABLE_EVENT_STR	"disable_event"



struct event_probe_data {

	struct ftrace_event_file	*file;

	struct trace_event_file	*file;

	unsigned long			count;

	int				ref;

	bool				enable;
@@ -2226,7 +2226,7 @@ event_enable_func(struct ftrace_hash *hash, 
		  char *glob, char *cmd, char *param, int enabled)

{

	struct trace_array *tr = top_trace_array();

	struct ftrace_event_file *file;

	struct trace_event_file *file;

	struct ftrace_probe_ops *ops;

	struct event_probe_data *data;

	const char *system;
@@ -2358,7 +2358,7 @@ static inline int register_event_cmds(void) { return 0; } 
#endif /* CONFIG_DYNAMIC_FTRACE */



/*

 * The top level array has already had its ftrace_event_file

 * The top level array has already had its trace_event_file

 * descriptors created in order to allow for early events to

 * be recorded. This function is called after the tracefs has been

 * initialized, and we now have to create the files associated
@@ -2367,7 +2367,7 @@ static inline int register_event_cmds(void) { return 0; } 
static __init void

__trace_early_add_event_dirs(struct trace_array *tr)

{

	struct ftrace_event_file *file;

	struct trace_event_file *file;

	int ret;
@@ -2407,7 +2407,7 @@ __trace_early_add_events(struct trace_array *tr) 
static void

__trace_remove_event_dirs(struct trace_array *tr)

{

	struct ftrace_event_file *file, *next;

	struct trace_event_file *file, *next;



	list_for_each_entry_safe(file, next, &tr->events, list)

		remove_event_file_dir(file);
@@ -2557,7 +2557,7 @@ int event_trace_del_tracer(struct trace_array *tr) 
static __init int event_trace_memsetup(void)

{

	field_cachep = KMEM_CACHE(ftrace_event_field, SLAB_PANIC);

	file_cachep = KMEM_CACHE(ftrace_event_file, SLAB_PANIC);

	file_cachep = KMEM_CACHE(trace_event_file, SLAB_PANIC);

	return 0;

}
@@ -2755,7 +2755,7 @@ static __init void event_test_stuff(void) 
static __init void event_trace_self_tests(void)

{

	struct ftrace_subsystem_dir *dir;

	struct ftrace_event_file *file;

	struct trace_event_file *file;

	struct ftrace_event_call *call;

	struct event_subsystem *system;

	struct trace_array *tr;