Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar: "Misc fixes: a documentation fix, a Sparse warning fix and a debugging fix" * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sched/debug: Fix task state recording/printout sched/deadline: Don't use dubious signed bitfields sched/deadline: Fix the description of runtime accounting in the documentation
This commit is contained in:
@@ -116,9 +116,9 @@ static inline long __trace_sched_switch_state(bool preempt, struct task_struct *
|
||||
* RUNNING (we will not have dequeued if state != RUNNING).
|
||||
*/
|
||||
if (preempt)
|
||||
return TASK_STATE_MAX;
|
||||
return TASK_REPORT_MAX;
|
||||
|
||||
return task_state_index(p);
|
||||
return 1 << task_state_index(p);
|
||||
}
|
||||
#endif /* CREATE_TRACE_POINTS */
|
||||
|
||||
@@ -164,7 +164,7 @@ TRACE_EVENT(sched_switch,
|
||||
{ 0x40, "P" }, { 0x80, "I" }) :
|
||||
"R",
|
||||
|
||||
__entry->prev_state & TASK_STATE_MAX ? "+" : "",
|
||||
__entry->prev_state & TASK_REPORT_MAX ? "+" : "",
|
||||
__entry->next_comm, __entry->next_pid, __entry->next_prio)
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user