diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /kernel/sched/fair.c | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'kernel/sched/fair.c')
| -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 4088eedea763..039de34f1521 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c | |||
| @@ -4269,7 +4269,7 @@ static void sync_throttle(struct task_group *tg, int cpu) | |||
| 4269 | pcfs_rq = tg->parent->cfs_rq[cpu]; | 4269 | pcfs_rq = tg->parent->cfs_rq[cpu]; |
| 4270 | 4270 | ||
| 4271 | cfs_rq->throttle_count = pcfs_rq->throttle_count; | 4271 | cfs_rq->throttle_count = pcfs_rq->throttle_count; |
| 4272 | pcfs_rq->throttled_clock_task = rq_clock_task(cpu_rq(cpu)); | 4272 | cfs_rq->throttled_clock_task = rq_clock_task(cpu_rq(cpu)); |
| 4273 | } | 4273 | } |
| 4274 | 4274 | ||
| 4275 | /* conditionally throttle active cfs_rq's from put_prev_entity() */ | 4275 | /* conditionally throttle active cfs_rq's from put_prev_entity() */ |