diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-06-01 13:52:20 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-01 13:52:20 -0700 |
| commit | fa482af8eb41c823506bef2efa612a1db63dabd5 (patch) | |
| tree | 3a08e3739b3872eab817a4f99af38ae3d63a548c | |
| parent | dc0d4d9c2eec4dc16bcb080eda8727e65e921c0a (diff) | |
| parent | c1f0c1f51bf7b9111de27c3cdbea9b647351bf7b (diff) | |
Merge branch 'for-lsk' of git://git.linaro.org/arm/big.LITTLE/mp into v3.10/topic/big.LITTLE
* 'for-lsk' of git://git.linaro.org/arm/big.LITTLE/mp:
sched: hmp: fix spinlock recursion in active migration
| -rw-r--r-- | kernel/sched/fair.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index fd57f0be5b4e..22ce83eb73f8 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -6462,10 +6462,10 @@ static int __do_active_load_balance_cpu_stop(void *data, bool check_sd_lb_flag) rcu_read_unlock(); double_unlock_balance(busiest_rq, target_rq); out_unlock: - if (!check_sd_lb_flag) - put_task_struct(p); busiest_rq->active_balance = 0; raw_spin_unlock_irq(&busiest_rq->lock); + if (!check_sd_lb_flag) + put_task_struct(p); return 0; } |