diff options
author | Alex Shi <alex.shi@linaro.org> | 2015-04-15 16:51:30 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2015-04-15 16:51:30 +0800 |
commit | b3c57d879f209074fbd0aa645274500151d69ec1 (patch) | |
tree | c1112539ec0c526ccc0b343c95cf64ac78e97f3a /kernel | |
parent | 88720d8b842c59efcc0c4dc17e2107f4dae502f5 (diff) | |
parent | c1f0c1f51bf7b9111de27c3cdbea9b647351bf7b (diff) |
Merge branch 'for-lsk' of git://git.linaro.org/arm/big.LITTLE/mp into linux-linaro-lsk
Diffstat (limited to 'kernel')
-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 41d0cbda605d..1baf6413a882 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -6489,10 +6489,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; } |