diff options
| author | Byungchul Park <[email protected]> | 2015-11-18 09:34:59 +0900 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2015-11-23 09:48:20 +0100 |
| commit | 525628c73bd6af65f27d927e699e7460d7d55ed3 (patch) | |
| tree | f861122f25a41c982295912b1194d37c5c77c777 | |
| parent | accaf6ea3db6f5fb997f096b6eefd5431d03f7e5 (diff) | |
sched/fair: Modify the comment about lock assumptions in migrate_task_rq_fair()
The comment describing migrate_task_rq_fair() says that the caller
should hold p->pi_lock. But in some cases the caller can hold
task_rq(p)->lock instead of p->pi_lock. So the comment is broken and
this patch fixes it.
Signed-off-by: Byungchul Park <[email protected]>
Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
| -rw-r--r-- | kernel/sched/fair.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index f7017ad91400..ff8ec8695957 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -5058,8 +5058,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) { |