Merge branch 'sched/core' into core/locking, to prepare the kernel/locking/ file...

[firefly-linux-kernel-4.4.55.git] / include / trace / events / sched.h

diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h
index 2a652d124fbbb119244c48139f4967678390f5be..04c308413a5dd3b2295b33c8c78bf56a11fa6b20 100644 (file)
--- a/include/trace/events/sched.h
+++ b/include/trace/events/sched.h
@@ -100,7 +100,7 @@ static inline long __trace_sched_switch_state(struct task_struct *p)
        /*
         * For all intents and purposes a preempted task is a running task.
         */
-       if (task_thread_info(p)->preempt_count & PREEMPT_ACTIVE)
+       if (task_preempt_count(p) & PREEMPT_ACTIVE)
                state = TASK_RUNNING | TASK_STATE_MAX;
 #endif