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

Commit 00f4b652 authored by Jeremy Linton's avatar Jeremy Linton Committed by Steven Rostedt (VMware)
Browse files

trace: rename trace_enum_map to trace_eval_map 

Each enum is loaded into the trace_enum_map, as we
are now using this for more than enums rename it.

Link: http://lkml.kernel.org/r/20170531215653.3240-3-jeremy.linton@arm.com



Signed-off-by: default avatarJeremy Linton <jeremy.linton@arm.com>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 02fd7f68

include/linux/module.h

+1 −1
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ struct module { 
#ifdef CONFIG_EVENT_TRACING

	struct trace_event_call **trace_events;

	unsigned int num_trace_events;

	struct trace_enum_map **trace_enums;

	struct trace_eval_map **trace_enums;

	unsigned int num_trace_enums;

#endif

#ifdef CONFIG_FTRACE_MCOUNT_RECORD

include/linux/tracepoint.h

+3 −3
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ struct module; 
struct tracepoint;

struct notifier_block;



struct trace_enum_map {

struct trace_eval_map {

	const char		*system;

	const char		*enum_string;

	unsigned long		enum_value;

	const char		*eval_string;

	unsigned long		eval_value;

};



#define TRACEPOINT_DEFAULT_PRIO	10

include/trace/trace_events.h

+4 −4
Original line number Diff line number Diff line
@@ -35,14 +35,14 @@ TRACE_MAKE_SYSTEM_STR(); 


#undef TRACE_DEFINE_ENUM

#define TRACE_DEFINE_ENUM(a)				\

	static struct trace_enum_map __used __initdata	\

	static struct trace_eval_map __used __initdata	\

	__##TRACE_SYSTEM##_##a =			\

	{						\

		.system = TRACE_SYSTEM_STRING,		\

		.enum_string = #a,			\

		.enum_value = a				\

		.eval_string = #a,			\

		.eval_value = a				\

	};						\

	static struct trace_enum_map __used		\

	static struct trace_eval_map __used		\

	__attribute__((section("_ftrace_eval_map")))	\

	*TRACE_SYSTEM##_##a = &__##TRACE_SYSTEM##_##a

kernel/trace/trace.c

+12 −12
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ union trace_enum_map_item; 
struct trace_enum_map_tail {

	/*

	 * "end" is first and points to NULL as it must be different

	 * than "mod" or "enum_string"

	 * than "mod" or "eval_string"

	 */

	union trace_enum_map_item	*next;

	const char			*end;	/* points to NULL */
@@ -148,7 +148,7 @@ static DEFINE_MUTEX(trace_enum_mutex); 
 * pointer to the next array of saved enum_map items.

 */

union trace_enum_map_item {

	struct trace_enum_map		map;

	struct trace_eval_map		map;

	struct trace_enum_map_head	head;

	struct trace_enum_map_tail	tail;

};
@@ -4748,7 +4748,7 @@ static const struct file_operations tracing_saved_cmdlines_size_fops = { 
static union trace_enum_map_item *

update_enum_map(union trace_enum_map_item *ptr)

{

	if (!ptr->map.enum_string) {

	if (!ptr->map.eval_string) {

		if (ptr->tail.next) {

			ptr = ptr->tail.next;

			/* Set ptr to the next real item (skip head) */
@@ -4808,7 +4808,7 @@ static int enum_map_show(struct seq_file *m, void *v) 
	union trace_enum_map_item *ptr = v;



	seq_printf(m, "%s %ld (%s)\n",

		   ptr->map.enum_string, ptr->map.enum_value,

		   ptr->map.eval_string, ptr->map.eval_value,

		   ptr->map.system);



	return 0;
@@ -4844,11 +4844,11 @@ trace_enum_jmp_to_tail(union trace_enum_map_item *ptr) 
}



static void

trace_insert_enum_map_file(struct module *mod, struct trace_enum_map **start,

trace_insert_enum_map_file(struct module *mod, struct trace_eval_map **start,

			   int len)

{

	struct trace_enum_map **stop;

	struct trace_enum_map **map;

	struct trace_eval_map **stop;

	struct trace_eval_map **map;

	union trace_enum_map_item *map_array;

	union trace_enum_map_item *ptr;
@@ -4902,13 +4902,13 @@ static void trace_create_enum_file(struct dentry *d_tracer) 
#else /* CONFIG_TRACE_ENUM_MAP_FILE */

static inline void trace_create_enum_file(struct dentry *d_tracer) { }

static inline void trace_insert_enum_map_file(struct module *mod,

			      struct trace_enum_map **start, int len) { }

			      struct trace_eval_map **start, int len) { }

#endif /* !CONFIG_TRACE_ENUM_MAP_FILE */



static void trace_insert_enum_map(struct module *mod,

				  struct trace_enum_map **start, int len)

				  struct trace_eval_map **start, int len)

{

	struct trace_enum_map **map;

	struct trace_eval_map **map;



	if (len <= 0)

		return;
@@ -7732,8 +7732,8 @@ struct dentry *tracing_init_dentry(void) 
	return NULL;

}



extern struct trace_enum_map *__start_ftrace_eval_maps[];

extern struct trace_enum_map *__stop_ftrace_eval_maps[];

extern struct trace_eval_map *__start_ftrace_eval_maps[];

extern struct trace_eval_map *__stop_ftrace_eval_maps[];



static void __init trace_enum_init(void)

{

kernel/trace/trace.h

+2 −2
Original line number Diff line number Diff line
@@ -1773,10 +1773,10 @@ static inline const char *get_syscall_name(int syscall) 


#ifdef CONFIG_EVENT_TRACING

void trace_event_init(void);

void trace_event_enum_update(struct trace_enum_map **map, int len);

void trace_event_enum_update(struct trace_eval_map **map, int len);

#else

static inline void __init trace_event_init(void) { }

static inline void trace_event_enum_update(struct trace_enum_map **map, int len) { }

static inline void trace_event_enum_update(struct trace_eval_map **map, int len) { }

#endif



extern struct trace_iterator *tracepoint_print_iter;