diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-06-27 11:35:02 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-06-27 11:35:02 +0200 |
| commit | 630741fb60ac4e286f5396403c0d864d924c02bc (patch) | |
| tree | 16eb952c3653386c6d1ad99e369615dfe65e4d67 /kernel/sched/sched.h | |
| parent | 807e5b80687c06715d62df51a5473b231e3e8b15 (diff) | |
| parent | ea1dc6fc6242f991656e35e2ed3d90ec1cd13418 (diff) | |
| download | linux-stable-630741fb60ac4e286f5396403c0d864d924c02bc.tar.gz linux-stable-630741fb60ac4e286f5396403c0d864d924c02bc.tar.bz2 linux-stable-630741fb60ac4e286f5396403c0d864d924c02bc.zip | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/sched.h')
| -rw-r--r-- | kernel/sched/sched.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index de607e4febd9..71ce9862abc3 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -437,7 +437,7 @@ struct cfs_rq { u64 throttled_clock, throttled_clock_task; u64 throttled_clock_task_time; - int throttled, throttle_count; + int throttled, throttle_count, throttle_uptodate; struct list_head throttled_list; #endif /* CONFIG_CFS_BANDWIDTH */ #endif /* CONFIG_FAIR_GROUP_SCHED */ |