diff options
-rw-r--r-- | kernel/sched.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 070eefdd90f5..62830eaec52f 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -163,10 +163,11 @@ struct rt_prio_array { | |||
163 | }; | 163 | }; |
164 | 164 | ||
165 | struct rt_bandwidth { | 165 | struct rt_bandwidth { |
166 | ktime_t rt_period; | 166 | /* nests inside the rq lock: */ |
167 | u64 rt_runtime; | 167 | spinlock_t rt_runtime_lock; |
168 | spinlock_t rt_runtime_lock; | 168 | ktime_t rt_period; |
169 | struct hrtimer rt_period_timer; | 169 | u64 rt_runtime; |
170 | struct hrtimer rt_period_timer; | ||
170 | }; | 171 | }; |
171 | 172 | ||
172 | static struct rt_bandwidth def_rt_bandwidth; | 173 | static struct rt_bandwidth def_rt_bandwidth; |
@@ -403,6 +404,7 @@ struct rt_rq { | |||
403 | int rt_throttled; | 404 | int rt_throttled; |
404 | u64 rt_time; | 405 | u64 rt_time; |
405 | u64 rt_runtime; | 406 | u64 rt_runtime; |
407 | /* Nests inside the rq lock: */ | ||
406 | spinlock_t rt_runtime_lock; | 408 | spinlock_t rt_runtime_lock; |
407 | 409 | ||
408 | #ifdef CONFIG_RT_GROUP_SCHED | 410 | #ifdef CONFIG_RT_GROUP_SCHED |