ftrace: remove add-hoc code

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 2 insertions, 8 deletions

diff --git a/kernel/trace/trace_sched_switch.c b/kernel/trace/trace_sched_switch.c
index bddf676914ed..5671db0e1827 100644
--- a/kernel/trace/trace_sched_switch.c
+++ b/kernel/trace/trace_sched_switch.c
@@ -36,11 +36,8 @@ ctx_switch_func(void *__rq, struct task_struct *prev, struct task_struct *next)
         data = tr->data[cpu];
         disabled = atomic_inc_return(&data->disabled);
 
-        if (likely(disabled == 1)) {
+        if (likely(disabled == 1))
                 tracing_sched_switch_trace(tr, data, prev, next, flags);
-                if (trace_flags & TRACE_ITER_SCHED_TREE)
-                        ftrace_all_fair_tasks(__rq, tr, data);
-        }
 
         atomic_dec(&data->disabled);
         local_irq_restore(flags);
@@ -65,11 +62,8 @@ wakeup_func(void *__rq, struct task_struct *wakee, struct task_struct *curr)
         data = tr->data[cpu];
         disabled = atomic_inc_return(&data->disabled);
 
-        if (likely(disabled == 1)) {
+        if (likely(disabled == 1))
                 tracing_sched_wakeup_trace(tr, data, wakee, curr, flags);
-                if (trace_flags & TRACE_ITER_SCHED_TREE)
-                        ftrace_all_fair_tasks(__rq, tr, data);
-        }
 
         atomic_dec(&data->disabled);
         local_irq_restore(flags);