diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-18 10:47:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-18 10:47:44 -0700 |
| commit | d65b78f5d85b0988b6541f52dadc553f15f51949 (patch) | |
| tree | 33eead3e73d6bf0aa2b0d8e0c644c7ce8d02e81d | |
| parent | f79a17bf268cc043eecffb65033b2e58fc037eef (diff) | |
| parent | d49db342f0e276b354383b3281c5668b6b80f5c2 (diff) | |
| download | linux-d65b78f5d85b0988b6541f52dadc553f15f51949.tar.gz linux-d65b78f5d85b0988b6541f52dadc553f15f51949.tar.bz2 linux-d65b78f5d85b0988b6541f52dadc553f15f51949.zip | |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fix from Ingo Molnar:
"A oneliner rq throttling fix"
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/fair: Test list head instead of list entry in throttle_cfs_rq()
| -rw-r--r-- | kernel/sched/fair.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 65c8f3ebdc3c..d113c3ba8bc4 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -3683,7 +3683,7 @@ static void throttle_cfs_rq(struct cfs_rq *cfs_rq) cfs_rq->throttled = 1; cfs_rq->throttled_clock = rq_clock(rq); raw_spin_lock(&cfs_b->lock); - empty = list_empty(&cfs_rq->throttled_list); + empty = list_empty(&cfs_b->throttled_cfs_rq); /* * Add to the _head_ of the list, so that an already-started |