diff options
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r-- | kernel/trace/trace.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index b24a72d35008..f2bd275bb60f 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
@@ -341,7 +341,7 @@ unsigned long trace_flags = TRACE_ITER_PRINT_PARENT | TRACE_ITER_PRINTK | | |||
341 | TRACE_ITER_GRAPH_TIME | TRACE_ITER_RECORD_CMD | TRACE_ITER_OVERWRITE; | 341 | TRACE_ITER_GRAPH_TIME | TRACE_ITER_RECORD_CMD | TRACE_ITER_OVERWRITE; |
342 | 342 | ||
343 | static int trace_stop_count; | 343 | static int trace_stop_count; |
344 | static DEFINE_SPINLOCK(tracing_start_lock); | 344 | static DEFINE_RAW_SPINLOCK(tracing_start_lock); |
345 | 345 | ||
346 | static void wakeup_work_handler(struct work_struct *work) | 346 | static void wakeup_work_handler(struct work_struct *work) |
347 | { | 347 | { |
@@ -961,7 +961,7 @@ void tracing_start(void) | |||
961 | if (tracing_disabled) | 961 | if (tracing_disabled) |
962 | return; | 962 | return; |
963 | 963 | ||
964 | spin_lock_irqsave(&tracing_start_lock, flags); | 964 | raw_spin_lock_irqsave(&tracing_start_lock, flags); |
965 | if (--trace_stop_count) { | 965 | if (--trace_stop_count) { |
966 | if (trace_stop_count < 0) { | 966 | if (trace_stop_count < 0) { |
967 | /* Someone screwed up their debugging */ | 967 | /* Someone screwed up their debugging */ |
@@ -986,7 +986,7 @@ void tracing_start(void) | |||
986 | 986 | ||
987 | ftrace_start(); | 987 | ftrace_start(); |
988 | out: | 988 | out: |
989 | spin_unlock_irqrestore(&tracing_start_lock, flags); | 989 | raw_spin_unlock_irqrestore(&tracing_start_lock, flags); |
990 | } | 990 | } |
991 | 991 | ||
992 | /** | 992 | /** |
@@ -1001,7 +1001,7 @@ void tracing_stop(void) | |||
1001 | unsigned long flags; | 1001 | unsigned long flags; |
1002 | 1002 | ||
1003 | ftrace_stop(); | 1003 | ftrace_stop(); |
1004 | spin_lock_irqsave(&tracing_start_lock, flags); | 1004 | raw_spin_lock_irqsave(&tracing_start_lock, flags); |
1005 | if (trace_stop_count++) | 1005 | if (trace_stop_count++) |
1006 | goto out; | 1006 | goto out; |
1007 | 1007 | ||
@@ -1019,7 +1019,7 @@ void tracing_stop(void) | |||
1019 | arch_spin_unlock(&ftrace_max_lock); | 1019 | arch_spin_unlock(&ftrace_max_lock); |
1020 | 1020 | ||
1021 | out: | 1021 | out: |
1022 | spin_unlock_irqrestore(&tracing_start_lock, flags); | 1022 | raw_spin_unlock_irqrestore(&tracing_start_lock, flags); |
1023 | } | 1023 | } |
1024 | 1024 | ||
1025 | void trace_stop_cmdline_recording(void); | 1025 | void trace_stop_cmdline_recording(void); |