aboutsummaryrefslogtreecommitdiff
path: root/kernel/trace
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-05-12 21:20:54 +0200
committerThomas Gleixner <tglx@linutronix.de>2008-05-23 21:13:32 +0200
commit4d9493c90f8e6e1b164aede3814010a290161abb (patch)
treeff92e089d2da9fb5a40511d81f8e57a7e06fdf80 /kernel/trace
parentd05cdb25d80f06f77aa6bddb53cd1390d4d91a0b (diff)
ftrace: remove add-hoc code
Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/trace')
-rw-r--r--kernel/trace/trace_sched_switch.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/kernel/trace/trace_sched_switch.c b/kernel/trace/trace_sched_switch.c
index bddf676914e..5671db0e182 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);