From 15687732ef25840ce31582f2ac6bac9f54315180 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Tue, 25 Mar 2008 13:51:45 +0100 Subject: [PATCH] --- yaml --- r: 91086 b: refs/heads/master c: ea736ed5d353d7a3aa1cf8ce4cf8d947bc353fb2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0bbfce748dde..9dccf59077c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 112f53f5d700589de741dca67c77439e96ea94a7 +refs/heads/master: ea736ed5d353d7a3aa1cf8ce4cf8d947bc353fb2 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 070eefdd90f5..62830eaec52f 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -163,10 +163,11 @@ struct rt_prio_array { }; struct rt_bandwidth { - ktime_t rt_period; - u64 rt_runtime; - spinlock_t rt_runtime_lock; - struct hrtimer rt_period_timer; + /* nests inside the rq lock: */ + spinlock_t rt_runtime_lock; + ktime_t rt_period; + u64 rt_runtime; + struct hrtimer rt_period_timer; }; static struct rt_bandwidth def_rt_bandwidth; @@ -403,6 +404,7 @@ struct rt_rq { int rt_throttled; u64 rt_time; u64 rt_runtime; + /* Nests inside the rq lock: */ spinlock_t rt_runtime_lock; #ifdef CONFIG_RT_GROUP_SCHED