diff --git a/[refs] b/[refs] index 22d66f279f5f..0202e2a8034f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99bc52429f11d1f4f81495ac8237085aaeb6bccf +refs/heads/master: 26a148eb9c790149750f7e77da0d96029443d400 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index f107204db53f..e3f0bac05270 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -422,6 +422,7 @@ struct rt_rq { */ struct root_domain { atomic_t refcount; + atomic_t rto_count; struct rcu_head rcu; cpumask_var_t span; cpumask_var_t online; @@ -431,7 +432,6 @@ struct root_domain { * one runnable RT task. */ cpumask_var_t rto_mask; - atomic_t rto_count; struct cpupri cpupri; };