diff options
Diffstat (limited to 'kernel/sched_fair.c')
-rw-r--r-- | kernel/sched_fair.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index 49ad99378f8..8a5e7632d09 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c | |||
@@ -1423,7 +1423,8 @@ select_idle_sibling(struct task_struct *p, struct sched_domain *sd, int target) | |||
1423 | * | 1423 | * |
1424 | * preempt must be disabled. | 1424 | * preempt must be disabled. |
1425 | */ | 1425 | */ |
1426 | static int select_task_rq_fair(struct task_struct *p, int sd_flag, int wake_flags) | 1426 | static int |
1427 | select_task_rq_fair(struct rq *rq, struct task_struct *p, int sd_flag, int wake_flags) | ||
1427 | { | 1428 | { |
1428 | struct sched_domain *tmp, *affine_sd = NULL, *sd = NULL; | 1429 | struct sched_domain *tmp, *affine_sd = NULL, *sd = NULL; |
1429 | int cpu = smp_processor_id(); | 1430 | int cpu = smp_processor_id(); |
@@ -1521,8 +1522,11 @@ static int select_task_rq_fair(struct task_struct *p, int sd_flag, int wake_flag | |||
1521 | cpumask_weight(sched_domain_span(sd)))) | 1522 | cpumask_weight(sched_domain_span(sd)))) |
1522 | tmp = affine_sd; | 1523 | tmp = affine_sd; |
1523 | 1524 | ||
1524 | if (tmp) | 1525 | if (tmp) { |
1526 | raw_spin_unlock(&rq->lock); | ||
1525 | update_shares(tmp); | 1527 | update_shares(tmp); |
1528 | raw_spin_lock(&rq->lock); | ||
1529 | } | ||
1526 | } | 1530 | } |
1527 | #endif | 1531 | #endif |
1528 | 1532 | ||