aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJeremy Linton <jeremy.linton@arm.com>2017-05-31 16:56:43 -0500
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2017-06-13 17:08:57 -0400
commit00f4b652b6f1dbfd4e1d5419d7f1cc23b1374da8 (patch)
tree2da5ea220d351d136146ad29b1baae6f84dd75cb /include
parenttrace: rename kernel enum section to eval (diff)
downloadlinux-dev-00f4b652b6f1dbfd4e1d5419d7f1cc23b1374da8.tar.xz
linux-dev-00f4b652b6f1dbfd4e1d5419d7f1cc23b1374da8.zip
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: Jeremy Linton <jeremy.linton@arm.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/module.h2
-rw-r--r--include/linux/tracepoint.h6
-rw-r--r--include/trace/trace_events.h8
3 files changed, 8 insertions, 8 deletions
diff --git a/include/linux/module.h b/include/linux/module.h
index 21f56393602f..46b48043d741 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -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
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index cc48cb2ce209..f7b0f5525e46 100644
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@ -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
diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h
index 4bdd84023f5b..49cce5fb54ee 100644
--- a/include/trace/trace_events.h
+++ b/include/trace/trace_events.h
@@ -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