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.

Signed-off-by: Anton Vorontsov anton.vorontsov@linaro.org --- kernel/trace/trace_stack.c | 4 ---- 1 file changed, 4 deletions(-)

diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c index d4545f4..94c2c53 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);

@@ -115,9 +114,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();