diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-08-05 02:46:15 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-08-05 02:46:15 -0400 |
commit | fc9ea5a1e53ee54f681e226d735008e2a6f8f470 (patch) | |
tree | fe59eb9aef5d797ae387885e6833c9c4d05735ad /kernel | |
parent | 61be7fdec2f51b99570cd5dcc30c7848c8e56513 (diff) | |
parent | 9da79ab83ee33ddc1fdd0858fd3d70925a1bde99 (diff) |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/trace/trace_kprobe.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 1b79d1c15726..8b27c9849b42 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c | |||
@@ -925,14 +925,17 @@ static int create_trace_probe(int argc, char **argv) | |||
925 | pr_info("Delete command needs an event name.\n"); | 925 | pr_info("Delete command needs an event name.\n"); |
926 | return -EINVAL; | 926 | return -EINVAL; |
927 | } | 927 | } |
928 | mutex_lock(&probe_lock); | ||
928 | tp = find_probe_event(event, group); | 929 | tp = find_probe_event(event, group); |
929 | if (!tp) { | 930 | if (!tp) { |
931 | mutex_unlock(&probe_lock); | ||
930 | pr_info("Event %s/%s doesn't exist.\n", group, event); | 932 | pr_info("Event %s/%s doesn't exist.\n", group, event); |
931 | return -ENOENT; | 933 | return -ENOENT; |
932 | } | 934 | } |
933 | /* delete an event */ | 935 | /* delete an event */ |
934 | unregister_trace_probe(tp); | 936 | unregister_trace_probe(tp); |
935 | free_trace_probe(tp); | 937 | free_trace_probe(tp); |
938 | mutex_unlock(&probe_lock); | ||
936 | return 0; | 939 | return 0; |
937 | } | 940 | } |
938 | 941 | ||