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

Commit 2875a08b authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

tracing: Move ftrace_event_file() out of DYNAMIC_FTRACE ifdef 



Now that event triggers use ftrace_event_file(), it needs to be outside
the #ifdef CONFIG_DYNAMIC_FTRACE, as it can now be used when that is
not defined.

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

kernel/trace/trace_events.c

+13 −13
Original line number Diff line number Diff line
@@ -1855,19 +1855,6 @@ __trace_add_event_dirs(struct trace_array *tr) 
	}

}



#ifdef CONFIG_DYNAMIC_FTRACE



/* Avoid typos */

#define ENABLE_EVENT_STR	"enable_event"

#define DISABLE_EVENT_STR	"disable_event"



struct event_probe_data {

	struct ftrace_event_file	*file;

	unsigned long			count;

	int				ref;

	bool				enable;

};



struct ftrace_event_file *

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

{
@@ -1891,6 +1878,19 @@ find_event_file(struct trace_array *tr, const char *system, const char *event) 
	return NULL;

}



#ifdef CONFIG_DYNAMIC_FTRACE



/* Avoid typos */

#define ENABLE_EVENT_STR	"enable_event"

#define DISABLE_EVENT_STR	"disable_event"



struct event_probe_data {

	struct ftrace_event_file	*file;

	unsigned long			count;

	int				ref;

	bool				enable;

};



static void

event_enable_probe(unsigned long ip, unsigned long parent_ip, void **_data)

{