aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/locking/rtmutex.c
diff options
context:
space:
mode:
authorDavidlohr Bueso <dave@stgolabs.net>2015-05-19 13:24:57 -0400
committerThomas Gleixner <tglx@linutronix.de>2015-06-19 15:27:21 -0400
commit9f40a51a35a0e1445cc4873251c3df2631eda294 (patch)
treed623eded5b28b5e590f8b310e6b654d1d8ad6ff5 /kernel/locking/rtmutex.c
parent802ab58da74bb49ab348d2872190ef26ddc1a3e0 (diff)
locking/rtmutex: Update stale plist comments
... as of fb00aca4744 (rtmutex: Turn the plist into an rb-tree) we no longer use plists for queuing any waiters. Update stale comments. Signed-off-by: Davidlohr Bueso <dbueso@suse.de> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Mike Galbraith <umgwanakikbuti@gmail.com> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Cc: Davidlohr Bueso <dave@stgolabs.net> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/1432056298-18738-4-git-send-email-dave@stgolabs.net Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/locking/rtmutex.c')
-rw-r--r--kernel/locking/rtmutex.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
index 0add7248c8bf..86d4853d7b40 100644
--- a/kernel/locking/rtmutex.c
+++ b/kernel/locking/rtmutex.c
@@ -624,7 +624,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
624 */ 624 */
625 prerequeue_top_waiter = rt_mutex_top_waiter(lock); 625 prerequeue_top_waiter = rt_mutex_top_waiter(lock);
626 626
627 /* [7] Requeue the waiter in the lock waiter list. */ 627 /* [7] Requeue the waiter in the lock waiter tree. */
628 rt_mutex_dequeue(lock, waiter); 628 rt_mutex_dequeue(lock, waiter);
629 waiter->prio = task->prio; 629 waiter->prio = task->prio;
630 rt_mutex_enqueue(lock, waiter); 630 rt_mutex_enqueue(lock, waiter);
@@ -662,7 +662,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
662 /* 662 /*
663 * The waiter became the new top (highest priority) 663 * The waiter became the new top (highest priority)
664 * waiter on the lock. Replace the previous top waiter 664 * waiter on the lock. Replace the previous top waiter
665 * in the owner tasks pi waiters list with this waiter 665 * in the owner tasks pi waiters tree with this waiter
666 * and adjust the priority of the owner. 666 * and adjust the priority of the owner.
667 */ 667 */
668 rt_mutex_dequeue_pi(task, prerequeue_top_waiter); 668 rt_mutex_dequeue_pi(task, prerequeue_top_waiter);
@@ -673,7 +673,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
673 /* 673 /*
674 * The waiter was the top waiter on the lock, but is 674 * The waiter was the top waiter on the lock, but is
675 * no longer the top prority waiter. Replace waiter in 675 * no longer the top prority waiter. Replace waiter in
676 * the owner tasks pi waiters list with the new top 676 * the owner tasks pi waiters tree with the new top
677 * (highest priority) waiter and adjust the priority 677 * (highest priority) waiter and adjust the priority
678 * of the owner. 678 * of the owner.
679 * The new top waiter is stored in @waiter so that 679 * The new top waiter is stored in @waiter so that
@@ -747,7 +747,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
747 * 747 *
748 * @lock: The lock to be acquired. 748 * @lock: The lock to be acquired.
749 * @task: The task which wants to acquire the lock 749 * @task: The task which wants to acquire the lock
750 * @waiter: The waiter that is queued to the lock's wait list if the 750 * @waiter: The waiter that is queued to the lock's wait tree if the
751 * callsite called task_blocked_on_lock(), otherwise NULL 751 * callsite called task_blocked_on_lock(), otherwise NULL
752 */ 752 */
753static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task, 753static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task,
@@ -782,7 +782,7 @@ static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task,
782 782
783 /* 783 /*
784 * If @waiter != NULL, @task has already enqueued the waiter 784 * If @waiter != NULL, @task has already enqueued the waiter
785 * into @lock waiter list. If @waiter == NULL then this is a 785 * into @lock waiter tree. If @waiter == NULL then this is a
786 * trylock attempt. 786 * trylock attempt.
787 */ 787 */
788 if (waiter) { 788 if (waiter) {
@@ -795,7 +795,7 @@ static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task,
795 795
796 /* 796 /*
797 * We can acquire the lock. Remove the waiter from the 797 * We can acquire the lock. Remove the waiter from the
798 * lock waiters list. 798 * lock waiters tree.
799 */ 799 */
800 rt_mutex_dequeue(lock, waiter); 800 rt_mutex_dequeue(lock, waiter);
801 801
@@ -827,7 +827,7 @@ static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task,
827 * No waiters. Take the lock without the 827 * No waiters. Take the lock without the
828 * pi_lock dance.@task->pi_blocked_on is NULL 828 * pi_lock dance.@task->pi_blocked_on is NULL
829 * and we have no waiters to enqueue in @task 829 * and we have no waiters to enqueue in @task
830 * pi waiters list. 830 * pi waiters tree.
831 */ 831 */
832 goto takeit; 832 goto takeit;
833 } 833 }
@@ -844,7 +844,7 @@ static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task,
844 /* 844 /*
845 * Finish the lock acquisition. @task is the new owner. If 845 * Finish the lock acquisition. @task is the new owner. If
846 * other waiters exist we have to insert the highest priority 846 * other waiters exist we have to insert the highest priority
847 * waiter into @task->pi_waiters list. 847 * waiter into @task->pi_waiters tree.
848 */ 848 */
849 if (rt_mutex_has_waiters(lock)) 849 if (rt_mutex_has_waiters(lock))
850 rt_mutex_enqueue_pi(task, rt_mutex_top_waiter(lock)); 850 rt_mutex_enqueue_pi(task, rt_mutex_top_waiter(lock));
@@ -955,7 +955,7 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
955} 955}
956 956
957/* 957/*
958 * Remove the top waiter from the current tasks pi waiter list and 958 * Remove the top waiter from the current tasks pi waiter tree and
959 * queue it up. 959 * queue it up.
960 * 960 *
961 * Called with lock->wait_lock held. 961 * Called with lock->wait_lock held.