diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-26 13:10:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-26 13:10:16 -0700 |
| commit | cc71efda829413b734a2349ed4b9de1ac012bbc2 (patch) | |
| tree | 9644152b3de02d2a0fb75d21617838a6d03d03f1 /include | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| parent | sched, tracing: Fix trace_sched_pi_setprio() for deboosting (diff) | |
| download | linux-dev-cc71efda829413b734a2349ed4b9de1ac012bbc2.tar.xz linux-dev-cc71efda829413b734a2349ed4b9de1ac012bbc2.zip | |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Thomas Gleixner:
"Three fixes for scheduler and kthread code:
- allow calling kthread_park() on an already parked thread
- restore the sched_pi_setprio() tracepoint behaviour
- clarify the unclear string for the scheduling domain debug output"
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched, tracing: Fix trace_sched_pi_setprio() for deboosting
kthread: Allow kthread_park() on a parked kthread
sched/topology: Clarify root domain(s) debug string
Diffstat (limited to 'include')
| -rw-r--r-- | include/trace/events/sched.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h index bc01e06bc716..0be866c91f62 100644 --- a/include/trace/events/sched.h +++ b/include/trace/events/sched.h @@ -435,7 +435,9 @@ TRACE_EVENT(sched_pi_setprio, memcpy(__entry->comm, tsk->comm, TASK_COMM_LEN); __entry->pid = tsk->pid; __entry->oldprio = tsk->prio; - __entry->newprio = pi_task ? pi_task->prio : tsk->prio; + __entry->newprio = pi_task ? + min(tsk->normal_prio, pi_task->prio) : + tsk->normal_prio; /* XXX SCHED_DEADLINE bits missing */ ), |