Commit-ID: 466af29bf4270e84261712428a1304c28e3743fa Gitweb: http://git.kernel.org/tip/466af29bf4270e84261712428a1304c28e3743fa Author: Oleg Nesterov <o...@redhat.com> AuthorDate: Fri, 6 Jun 2014 18:52:06 +0200 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Wed, 16 Jul 2014 13:38:18 +0200
sched/deadline: Kill task_struct->pi_top_task Remove task_struct->pi_top_task. The only user, rt_mutex_setprio(), can use a local. Signed-off-by: Oleg Nesterov <o...@redhat.com> Signed-off-by: Peter Zijlstra <pet...@infradead.org> Cc: Juri Lelli <juri.le...@gmail.com> Cc: Alex Thorlton <athorl...@sgi.com> Cc: Andrew Morton <a...@linux-foundation.org> Cc: Daeseok Youn <daeseok.y...@gmail.com> Cc: Dario Faggioli <raist...@linux.it> Cc: Davidlohr Bueso <davidl...@hp.com> Cc: David Rientjes <rient...@google.com> Cc: Eric W. Biederman <ebied...@xmission.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Matthew Dempsky <mdemp...@chromium.org> Cc: Michal Simek <michal.si...@xilinx.com> Cc: Oleg Nesterov <o...@redhat.com> Link: http://lkml.kernel.org/r/20140606165206.gb29...@redhat.com Signed-off-by: Ingo Molnar <mi...@kernel.org> --- include/linux/sched.h | 2 -- kernel/fork.c | 1 - kernel/sched/core.c | 6 +++--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 306f4f0..c9c9ff7 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1440,8 +1440,6 @@ struct task_struct { struct rb_node *pi_waiters_leftmost; /* Deadlock detection and priority inheritance handling */ struct rt_mutex_waiter *pi_blocked_on; - /* Top pi_waiters task */ - struct task_struct *pi_top_task; #endif #ifdef CONFIG_DEBUG_MUTEXES diff --git a/kernel/fork.c b/kernel/fork.c index d2799d1..6ff87f442 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1095,7 +1095,6 @@ static void rt_mutex_init_task(struct task_struct *p) p->pi_waiters = RB_ROOT; p->pi_waiters_leftmost = NULL; p->pi_blocked_on = NULL; - p->pi_top_task = NULL; #endif } diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 2dbc63d..cf7695a 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2980,7 +2980,6 @@ void rt_mutex_setprio(struct task_struct *p, int prio) } trace_sched_pi_setprio(p, prio); - p->pi_top_task = rt_mutex_get_top_task(p); oldprio = p->prio; prev_class = p->sched_class; on_rq = p->on_rq; @@ -3000,8 +2999,9 @@ void rt_mutex_setprio(struct task_struct *p, int prio) * running task */ if (dl_prio(prio)) { - if (!dl_prio(p->normal_prio) || (p->pi_top_task && - dl_entity_preempt(&p->pi_top_task->dl, &p->dl))) { + struct task_struct *pi_task = rt_mutex_get_top_task(p); + if (!dl_prio(p->normal_prio) || + (pi_task && dl_entity_preempt(&pi_task->dl, &p->dl))) { p->dl.dl_boosted = 1; p->dl.dl_throttled = 0; enqueue_flag = ENQUEUE_REPLENISH; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
