Skip to content

Commit

Permalink
trace: rename trace_enum_mutex to trace_eval_mutex
Browse files Browse the repository at this point in the history
There is a lock protecting the trace_enum_map, rename
it to reflect the use by more than enums.

Link: http://lkml.kernel.org/r/20170531215653.3240-6-jeremy.linton@arm.com

Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
  • Loading branch information
Jeremy Linton authored and Steven Rostedt (VMware) committed Jun 13, 2017
1 parent 23bf8cb commit 1793ed9
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions kernel/trace/trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ struct trace_eval_map_tail {
const char *end; /* points to NULL */
};

static DEFINE_MUTEX(trace_enum_mutex);
static DEFINE_MUTEX(trace_eval_mutex);

/*
* The trace_eval_maps are saved in an array with two extra elements,
Expand Down Expand Up @@ -4785,7 +4785,7 @@ static void *enum_map_start(struct seq_file *m, loff_t *pos)
union trace_eval_map_item *v;
loff_t l = 0;

mutex_lock(&trace_enum_mutex);
mutex_lock(&trace_eval_mutex);

v = trace_eval_maps;
if (v)
Expand All @@ -4800,7 +4800,7 @@ static void *enum_map_start(struct seq_file *m, loff_t *pos)

static void enum_map_stop(struct seq_file *m, void *v)
{
mutex_unlock(&trace_enum_mutex);
mutex_unlock(&trace_eval_mutex);
}

static int enum_map_show(struct seq_file *m, void *v)
Expand Down Expand Up @@ -4865,7 +4865,7 @@ trace_insert_enum_map_file(struct module *mod, struct trace_eval_map **start,
return;
}

mutex_lock(&trace_enum_mutex);
mutex_lock(&trace_eval_mutex);

if (!trace_eval_maps)
trace_eval_maps = map_array;
Expand All @@ -4890,7 +4890,7 @@ trace_insert_enum_map_file(struct module *mod, struct trace_eval_map **start,
}
memset(map_array, 0, sizeof(*map_array));

mutex_unlock(&trace_enum_mutex);
mutex_unlock(&trace_eval_mutex);
}

static void trace_create_enum_file(struct dentry *d_tracer)
Expand Down Expand Up @@ -7768,7 +7768,7 @@ static void trace_module_remove_enums(struct module *mod)
if (!mod->num_trace_evals)
return;

mutex_lock(&trace_enum_mutex);
mutex_lock(&trace_eval_mutex);

map = trace_eval_maps;

Expand All @@ -7785,7 +7785,7 @@ static void trace_module_remove_enums(struct module *mod)
*last = trace_enum_jmp_to_tail(map)->tail.next;
kfree(map);
out:
mutex_unlock(&trace_enum_mutex);
mutex_unlock(&trace_eval_mutex);
}
#else
static inline void trace_module_remove_enums(struct module *mod) { }
Expand Down

0 comments on commit 1793ed9

Please sign in to comment.