diff options
author | Alex Shi <alex.shi@linaro.org> | 2013-12-22 11:12:04 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2013-12-22 11:12:04 +0800 |
commit | 3c6556b1a9c2f9c91aacbc57bac938691fedda81 (patch) | |
tree | ec95f19f5ed70514a148720429c7926a52a366c5 /kernel/sched/fair.c | |
parent | b8420132aa326738c0139b85a65f9fc12764570d (diff) | |
parent | 095f493c4d532b0ced3aee22e2d5b2cea02aa773 (diff) |
Merge remote-tracking branch 'stable/linux-3.10.y' into linux-linaro-lsk
Diffstat (limited to 'kernel/sched/fair.c')
-rw-r--r-- | kernel/sched/fair.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 7500a68f831..1ae8de26e9b 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -2483,6 +2483,8 @@ static void throttle_cfs_rq(struct cfs_rq *cfs_rq) cfs_rq->throttled_clock = rq->clock; raw_spin_lock(&cfs_b->lock); list_add_tail_rcu(&cfs_rq->throttled_list, &cfs_b->throttled_cfs_rq); + if (!cfs_b->timer_active) + __start_cfs_bandwidth(cfs_b); raw_spin_unlock(&cfs_b->lock); } |