manual merge of x86/reboot

[karo-tx-linux.git] / include / trace / events / sched.h

diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h
index 2e7d9947a10d3f62bfe12e450375625efae913df..613381bcde40a8c68a0917cd19d36d6a603c9e2a 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