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: Jeremy Linton <jeremy.linton@arm.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 314a0b9219c64704151ad50680bd89d133f1af57..800f9f9677a6cd90955dc33c3efa2cb8acd8f948 100644 (file)
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -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

diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h
index 00f643164ca2f202702c21ffd6c57e6e7e90dd70..4bdd84023f5b02758e4415cf0fcbfb356538f87f 100644 (file)
--- a/include/trace/trace_events.h
+++ b/include/trace/trace_events.h
@@ -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
 
 /*

diff --git a/kernel/module.c b/kernel/module.c
index 4a3665f8f8372aab68b658c24c30678806823eee..9ec4713c5eee2685e0dca61cca65452b9c373392 100644 (file)
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -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

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 63deff9cdf2c0abed40d938beafcea0a86880c06..acd3eb4d56a06511cd55a2c025d2ce95f89dfd1d 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -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