diff options
| author | David S. Miller <davem@davemloft.net> | 2018-06-03 15:31:58 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-03 15:31:58 +0200 |
| commit | 9c54aeb03a6d65a5834bd92376e921cbac6dfb8f (patch) | |
| tree | 70441095d58678711d68cfef4934765251425d1f /include/trace | |
| parent | net: phy: consider PHY_IGNORE_INTERRUPT in state machine PHY_NOLINK handling (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-9c54aeb03a6d65a5834bd92376e921cbac6dfb8f.tar.xz linux-9c54aeb03a6d65a5834bd92376e921cbac6dfb8f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Filling in the padding slot in the bpf structure as a bug fix in 'ne'
overlapped with actually using that padding area for something in
'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/trace')
| -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 */ ), |