1 files changed, 5 insertions, 5 deletions

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index f94be0c2827b..5b3b0c3c8a47 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -1251,7 +1251,7 @@ static int f_show(struct seq_file *m, void *v)
          */
         array_descriptor = strchr(field->type, '[');
 
-        if (!strncmp(field->type, "__data_loc", 10))
+        if (str_has_prefix(field->type, "__data_loc"))
                 array_descriptor = NULL;
 
         if (!array_descriptor)
@@ -2309,7 +2309,8 @@ static void __add_event_to_tracers(struct trace_event_call *call);
 int trace_add_event_call(struct trace_event_call *call)
 {
         int ret;
-        mutex_lock(&event_mutex);
+        lockdep_assert_held(&event_mutex);
+
         mutex_lock(&trace_types_lock);
 
         ret = __register_event(call, NULL);
@@ -2317,7 +2318,6 @@ int trace_add_event_call(struct trace_event_call *call)
                 __add_event_to_tracers(call);
 
         mutex_unlock(&trace_types_lock);
-        mutex_unlock(&event_mutex);
         return ret;
 }
 
@@ -2371,13 +2371,13 @@ int trace_remove_event_call(struct trace_event_call *call)
 {
         int ret;
 
-        mutex_lock(&event_mutex);
+        lockdep_assert_held(&event_mutex);
+
         mutex_lock(&trace_types_lock);
         down_write(&trace_event_sem);
         ret = probe_remove_event_call(call);
         up_write(&trace_event_sem);
         mutex_unlock(&trace_types_lock);
-        mutex_unlock(&event_mutex);
 
         return ret;
 }