projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
kernel
/
trace
/
trace.c
diff --git
a/kernel/trace/trace.c
b/kernel/trace/trace.c
index
b296186
..
9e158cc
100644
(file)
--- 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 |
TRACE_ITER_GRAPH_TIME | TRACE_ITER_RECORD_CMD | TRACE_ITER_OVERWRITE;
static int trace_stop_count;
TRACE_ITER_GRAPH_TIME | TRACE_ITER_RECORD_CMD | TRACE_ITER_OVERWRITE;
static int trace_stop_count;
-static DEFINE_SPINLOCK(tracing_start_lock);
+static DEFINE_
RAW_
SPINLOCK(tracing_start_lock);
static void wakeup_work_handler(struct work_struct *work)
{
static void wakeup_work_handler(struct work_struct *work)
{
@@
-961,7
+961,7
@@
void tracing_start(void)
if (tracing_disabled)
return;
if (tracing_disabled)
return;
- spin_lock_irqsave(&tracing_start_lock, flags);
+
raw_
spin_lock_irqsave(&tracing_start_lock, flags);
if (--trace_stop_count) {
if (trace_stop_count < 0) {
/* Someone screwed up their debugging */
if (--trace_stop_count) {
if (trace_stop_count < 0) {
/* Someone screwed up their debugging */
@@
-986,7
+986,7
@@
void tracing_start(void)
ftrace_start();
out:
ftrace_start();
out:
- spin_unlock_irqrestore(&tracing_start_lock, flags);
+
raw_
spin_unlock_irqrestore(&tracing_start_lock, flags);
}
/**
}
/**
@@
-1001,7
+1001,7
@@
void tracing_stop(void)
unsigned long flags;
ftrace_stop();
unsigned long flags;
ftrace_stop();
- spin_lock_irqsave(&tracing_start_lock, flags);
+
raw_
spin_lock_irqsave(&tracing_start_lock, flags);
if (trace_stop_count++)
goto out;
if (trace_stop_count++)
goto out;
@@
-1019,7
+1019,7
@@
void tracing_stop(void)
arch_spin_unlock(&ftrace_max_lock);
out:
arch_spin_unlock(&ftrace_max_lock);
out:
- spin_unlock_irqrestore(&tracing_start_lock, flags);
+
raw_
spin_unlock_irqrestore(&tracing_start_lock, flags);
}
void trace_stop_cmdline_recording(void);
}
void trace_stop_cmdline_recording(void);