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

trace: rename kernel enum section to eval 

The kernel and its modules have sections containing the enum
string to value conversions. Rename this section because we
intend to store more than enums in it.

Link: http://lkml.kernel.org/r/20170531215653.3240-2-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 6a5ae63a

include/asm-generic/vmlinux.lds.h

+3 −3
Original line number Diff line number Diff line
@@ -125,9 +125,9 @@ 
			VMLINUX_SYMBOL(__start_ftrace_events) = .;	\

			KEEP(*(_ftrace_events))				\

			VMLINUX_SYMBOL(__stop_ftrace_events) = .;	\

			VMLINUX_SYMBOL(__start_ftrace_enum_maps) = .;	\

			KEEP(*(_ftrace_enum_map))			\

			VMLINUX_SYMBOL(__stop_ftrace_enum_maps) = .;

			VMLINUX_SYMBOL(__start_ftrace_eval_maps) = .;	\

			KEEP(*(_ftrace_eval_map))			\

			VMLINUX_SYMBOL(__stop_ftrace_eval_maps) = .;

#else

#define FTRACE_EVENTS()

#endif

include/trace/trace_events.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ TRACE_MAKE_SYSTEM_STR(); 
		.enum_value = a				\

	};						\

	static struct trace_enum_map __used		\

	__attribute__((section("_ftrace_enum_map")))	\

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

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



/*

kernel/module.c

+1 −1
Original line number Diff line number Diff line
@@ -3077,7 +3077,7 @@ static int find_module_sections(struct module *mod, struct load_info *info) 
	mod->trace_events = section_objs(info, "_ftrace_events",

					 sizeof(*mod->trace_events),

					 &mod->num_trace_events);

	mod->trace_enums = section_objs(info, "_ftrace_enum_map",

	mod->trace_enums = section_objs(info, "_ftrace_eval_map",

					sizeof(*mod->trace_enums),

					&mod->num_trace_enums);

#endif

kernel/trace/trace.c

+4 −4
Original line number Diff line number Diff line
@@ -7732,15 +7732,15 @@ struct dentry *tracing_init_dentry(void) 
	return NULL;

}



extern struct trace_enum_map *__start_ftrace_enum_maps[];

extern struct trace_enum_map *__stop_ftrace_enum_maps[];

extern struct trace_enum_map *__start_ftrace_eval_maps[];

extern struct trace_enum_map *__stop_ftrace_eval_maps[];



static void __init trace_enum_init(void)

{

	int len;



	len = __stop_ftrace_enum_maps - __start_ftrace_enum_maps;

	trace_insert_enum_map(NULL, __start_ftrace_enum_maps, len);

	len = __stop_ftrace_eval_maps - __start_ftrace_eval_maps;

	trace_insert_enum_map(NULL, __start_ftrace_eval_maps, len);

}



#ifdef CONFIG_MODULES