diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-04-08 09:01:54 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-04-08 09:01:54 +0200 |
commit | 4bcc7827b02feea2c762fa6d46a1bffb300d7403 (patch) | |
tree | 45fd2b64247cd44201fe519720494d4bf01b7014 /kernel/sched/core.c | |
parent | 3f705dfdf85a6416f5f12e52b7610144a99cbedc (diff) | |
parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff) | |
download | linux-4bcc7827b02feea2c762fa6d46a1bffb300d7403.tar.bz2 |
Merge tag 'v4.0-rc7' into x86/asm, to resolve conflicts
Conflicts:
arch/x86/kernel/entry_64.S
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/core.c')
-rw-r--r-- | kernel/sched/core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index f0f831e8a345..62671f53202a 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3034,6 +3034,8 @@ void rt_mutex_setprio(struct task_struct *p, int prio) } else { if (dl_prio(oldprio)) p->dl.dl_boosted = 0; + if (rt_prio(oldprio)) + p->rt.timeout = 0; p->sched_class = &fair_sched_class; } |