From: Byungchul Park <[email protected]> The comment describing migrate_task_rq_fair() says that the caller should hold p->pi_lock. But in some other case, the caller can hold task_rq(p)->lock instead of p->pi_lock. So the comment is broken and this patch fixs it.
Signed-off-by: Byungchul Park <[email protected]> --- kernel/sched/fair.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 077076f..6f43dfd 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -5006,8 +5006,7 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_f /* * Called immediately before a task is migrated to a new cpu; task_cpu(p) and * cfs_rq_of(p) references at time of call are still valid and identify the - * previous cpu. However, the caller only guarantees p->pi_lock is held; no - * other assumptions, including the state of rq->lock, should be made. + * previous cpu. The caller guarantees p->pi_lock or task_rq(p)->lock is held. */ static void migrate_task_rq_fair(struct task_struct *p, int next_cpu) { -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/

