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
Showing the changes to include/trace (1 of 3 files). Show all
Unified · Split
| @@ -116,9 +116,9 @@ static inline long __trace_sched_switch_state(bool preempt, struct task_struct * · 115 unmodified lines | |||
| 116 | * RUNNING (we will not have dequeued if state != RUNNING). | 116 | * RUNNING (we will not have dequeued if state != RUNNING). |
| 117 | */ | 117 | */ |
| 118 | if (preempt) | 118 | if (preempt) |
| 119 | return TASK_STATE_MAX; | 119 | return TASK_REPORT_MAX; |
| 120 | 120 | ||
| 121 | return task_state_index(p); | 121 | return 1 << task_state_index(p); |
| 122 | } | 122 | } |
| 123 | #endif /* CREATE_TRACE_POINTS */ | 123 | #endif /* CREATE_TRACE_POINTS */ |
| 124 | 124 | ||
| @@ -164,7 +164,7 @@ TRACE_EVENT(sched_switch, · 39 unmodified lines | |||
| 164 | { 0x40, "P" }, { 0x80, "I" }) : | 164 | { 0x40, "P" }, { 0x80, "I" }) : |
| 165 | "R", | 165 | "R", |
| 166 | 166 | ||
| 167 | __entry->prev_state & TASK_STATE_MAX ? "+" : "", | 167 | __entry->prev_state & TASK_REPORT_MAX ? "+" : "", |
| 168 | __entry->next_comm, __entry->next_pid, __entry->next_prio) | 168 | __entry->next_comm, __entry->next_pid, __entry->next_prio) |
| 169 | ); | 169 | ); |
| 170 | 170 | ||