|
@@ -4837,7 +4837,7 @@ static const struct file_operations tracing_enum_map_fops = {
|
|
|
};
|
|
|
|
|
|
static inline union trace_eval_map_item *
|
|
|
-trace_enum_jmp_to_tail(union trace_eval_map_item *ptr)
|
|
|
+trace_eval_jmp_to_tail(union trace_eval_map_item *ptr)
|
|
|
{
|
|
|
/* Return tail of array given the head */
|
|
|
return ptr + ptr->head.length + 1;
|
|
@@ -4872,7 +4872,7 @@ trace_insert_enum_map_file(struct module *mod, struct trace_eval_map **start,
|
|
|
else {
|
|
|
ptr = trace_eval_maps;
|
|
|
for (;;) {
|
|
|
- ptr = trace_enum_jmp_to_tail(ptr);
|
|
|
+ ptr = trace_eval_jmp_to_tail(ptr);
|
|
|
if (!ptr->tail.next)
|
|
|
break;
|
|
|
ptr = ptr->tail.next;
|
|
@@ -7735,7 +7735,7 @@ struct dentry *tracing_init_dentry(void)
|
|
|
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)
|
|
|
+static void __init trace_eval_init(void)
|
|
|
{
|
|
|
int len;
|
|
|
|
|
@@ -7775,14 +7775,14 @@ static void trace_module_remove_enums(struct module *mod)
|
|
|
while (map) {
|
|
|
if (map->head.mod == mod)
|
|
|
break;
|
|
|
- map = trace_enum_jmp_to_tail(map);
|
|
|
+ map = trace_eval_jmp_to_tail(map);
|
|
|
last = &map->tail.next;
|
|
|
map = map->tail.next;
|
|
|
}
|
|
|
if (!map)
|
|
|
goto out;
|
|
|
|
|
|
- *last = trace_enum_jmp_to_tail(map)->tail.next;
|
|
|
+ *last = trace_eval_jmp_to_tail(map)->tail.next;
|
|
|
kfree(map);
|
|
|
out:
|
|
|
mutex_unlock(&trace_eval_mutex);
|
|
@@ -7839,7 +7839,7 @@ static __init int tracer_init_tracefs(void)
|
|
|
trace_create_file("saved_cmdlines_size", 0644, d_tracer,
|
|
|
NULL, &tracing_saved_cmdlines_size_fops);
|
|
|
|
|
|
- trace_enum_init();
|
|
|
+ trace_eval_init();
|
|
|
|
|
|
trace_create_enum_file(d_tracer);
|
|
|
|