trace: rename kernel enum section to eval
authorJeremy Linton <jeremy.linton@arm.com>
Wed, 31 May 2017 21:56:42 +0000 (16:56 -0500)
committerSteven Rostedt (VMware) <rostedt@goodmis.org>
Tue, 13 Jun 2017 21:08:46 +0000 (17:08 -0400)
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: Jeremy Linton <jeremy.linton@arm.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
include/asm-generic/vmlinux.lds.h
include/trace/trace_events.h
kernel/module.c
kernel/trace/trace.c

index 314a0b9..800f9f9 100644 (file)
                        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
index 00f6431..4bdd840 100644 (file)
@@ -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
 
 /*
index 4a3665f..9ec4713 100644 (file)
@@ -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
index 63deff9..acd3eb4 100644 (file)
@@ -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