diff --git a/[refs] b/[refs] index 113ecbd44c9e..f0f8283dab6e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff32504fdc56407654584ef187b20022c94a3486 +refs/heads/master: 77d683f3e0258d522c5506e7b5fd05c9411184d9 diff --git a/trunk/kernel/trace/trace.h b/trunk/kernel/trace/trace.h index a71bbe0a3631..5ac697065a48 100644 --- a/trunk/kernel/trace/trace.h +++ b/trunk/kernel/trace/trace.h @@ -551,7 +551,7 @@ extern struct pid *ftrace_pid_trace; static inline int ftrace_trace_task(struct task_struct *task) { - if (ftrace_pid_trace) + if (!ftrace_pid_trace) return 1; return test_tsk_trace_trace(task);