From d99431e54aefaccf8934b84c78abc36fc24f08e0 Mon Sep 17 00:00:00 2001
From: Anton Vorontsov <anton.vorontsov@linaro.org>
Date: Wed, 18 Jul 2012 11:56:01 -0700
Subject: [PATCH] --- yaml --- r: 346894 b: refs/heads/master c:
 717a9ef7f355480686cdbac3f32d6075437a923e h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/kernel/trace/trace_stack.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d6520a3dc0ed..417ad138839d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d60da506cbeb3f1907a740547dd7ef04a93e908e
+refs/heads/master: 717a9ef7f355480686cdbac3f32d6075437a923e
diff --git a/trunk/kernel/trace/trace_stack.c b/trunk/kernel/trace/trace_stack.c
index 0c1b165778e5..42ca822fc701 100644
--- a/trunk/kernel/trace/trace_stack.c
+++ b/trunk/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();