aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_output.c
diff options
context:
space:
mode:
authorzhangwei(Jovi) <jovi.zhangwei@huawei.com>2013-03-11 03:14:03 -0400
committerSteven Rostedt <rostedt@goodmis.org>2013-03-15 13:22:10 -0400
commit52f6ad6dc3f4c6de598fe7cc9b629888d624aa52 (patch)
treeae3d4edf8b44bf9e77e970e58411420e6e164b60 /kernel/trace/trace_output.c
parent36a78e9e8792bfb052643eaf9374f837e634982c (diff)
tracing: Rename trace_event_mutex to trace_event_sem
trace_event_mutex is an rw semaphore now, not a mutex, change the name. Link: http://lkml.kernel.org/r/513D843B.40109@huawei.com Signed-off-by: zhangwei(Jovi) <jovi.zhangwei@huawei.com> [ Forward ported to my new code ] Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/trace_output.c')
-rw-r--r--kernel/trace/trace_output.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index 19f48e7edc39..f475b2a7ac88 100644
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -14,7 +14,7 @@
14/* must be a power of 2 */ 14/* must be a power of 2 */
15#define EVENT_HASHSIZE 128 15#define EVENT_HASHSIZE 128
16 16
17DECLARE_RWSEM(trace_event_mutex); 17DECLARE_RWSEM(trace_event_sem);
18 18
19static struct hlist_head event_hash[EVENT_HASHSIZE] __read_mostly; 19static struct hlist_head event_hash[EVENT_HASHSIZE] __read_mostly;
20 20
@@ -826,12 +826,12 @@ static int trace_search_list(struct list_head **list)
826 826
827void trace_event_read_lock(void) 827void trace_event_read_lock(void)
828{ 828{
829 down_read(&trace_event_mutex); 829 down_read(&trace_event_sem);
830} 830}
831 831
832void trace_event_read_unlock(void) 832void trace_event_read_unlock(void)
833{ 833{
834 up_read(&trace_event_mutex); 834 up_read(&trace_event_sem);
835} 835}
836 836
837/** 837/**
@@ -854,7 +854,7 @@ int register_ftrace_event(struct trace_event *event)
854 unsigned key; 854 unsigned key;
855 int ret = 0; 855 int ret = 0;
856 856
857 down_write(&trace_event_mutex); 857 down_write(&trace_event_sem);
858 858
859 if (WARN_ON(!event)) 859 if (WARN_ON(!event))
860 goto out; 860 goto out;
@@ -909,14 +909,14 @@ int register_ftrace_event(struct trace_event *event)
909 909
910 ret = event->type; 910 ret = event->type;
911 out: 911 out:
912 up_write(&trace_event_mutex); 912 up_write(&trace_event_sem);
913 913
914 return ret; 914 return ret;
915} 915}
916EXPORT_SYMBOL_GPL(register_ftrace_event); 916EXPORT_SYMBOL_GPL(register_ftrace_event);
917 917
918/* 918/*
919 * Used by module code with the trace_event_mutex held for write. 919 * Used by module code with the trace_event_sem held for write.
920 */ 920 */
921int __unregister_ftrace_event(struct trace_event *event) 921int __unregister_ftrace_event(struct trace_event *event)
922{ 922{
@@ -931,9 +931,9 @@ int __unregister_ftrace_event(struct trace_event *event)
931 */ 931 */
932int unregister_ftrace_event(struct trace_event *event) 932int unregister_ftrace_event(struct trace_event *event)
933{ 933{
934 down_write(&trace_event_mutex); 934 down_write(&trace_event_sem);
935 __unregister_ftrace_event(event); 935 __unregister_ftrace_event(event);
936 up_write(&trace_event_mutex); 936 up_write(&trace_event_sem);
937 937
938 return 0; 938 return 0;
939} 939}