diff options
| author | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-07-18 11:56:01 -0700 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-11-19 15:07:13 -0500 |
| commit | 717a9ef7f355480686cdbac3f32d6075437a923e (patch) | |
| tree | 8fbf18ec40837c65bb4dc193e5b7c07abdf62abd /kernel | |
| parent | d60da506cbeb3f1907a740547dd7ef04a93e908e (diff) | |
| download | linux-stable-717a9ef7f355480686cdbac3f32d6075437a923e.tar.gz linux-stable-717a9ef7f355480686cdbac3f32d6075437a923e.tar.bz2 linux-stable-717a9ef7f355480686cdbac3f32d6075437a923e.zip | |
tracing: Remove unneeded checks from the stack tracer
It seems that 'ftrace_enabled' flag should not be used inside the tracer
functions. The ftrace core is using this flag for internal purposes, and
the flag wasn't meant to be used in tracers' runtime checks.
stack tracer is the only tracer that abusing the flag. So stop it from
serving as a bad example.
Also, there is a local 'stack_trace_disabled' flag in the stack tracer,
which is never updated; so it can be removed as well.
Link: http://lkml.kernel.org/r/1342637761-9655-1-git-send-email-anton.vorontsov@linaro.org
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace_stack.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c index 0c1b165778e5..42ca822fc701 100644 --- a/kernel/trace/trace_stack.c +++ b/kernel/trace/trace_stack.c @@ -33,7 +33,6 @@ static unsigned long max_stack_size; static arch_spinlock_t max_stack_lock = (arch_spinlock_t)__ARCH_SPIN_LOCK_UNLOCKED; -static int stack_trace_disabled __read_mostly; static DEFINE_PER_CPU(int, trace_active); static DEFINE_MUTEX(stack_sysctl_mutex); @@ -116,9 +115,6 @@ stack_trace_call(unsigned long ip, unsigned long parent_ip, { int cpu; - if (unlikely(!ftrace_enabled || stack_trace_disabled)) - return; - preempt_disable_notrace(); cpu = raw_smp_processor_id(); |