diff --git a/[refs] b/[refs] index 19fd7badfcc2..1ecb04757e3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84de4274893691aa8c471a1f7336d51e555d23a0 +refs/heads/master: 6e1938d3ad58c940ec4119d387dd92a787cb238c diff --git a/trunk/kernel/sched_rt.c b/trunk/kernel/sched_rt.c index 1a2d8f0aa659..deff0c77d705 100644 --- a/trunk/kernel/sched_rt.c +++ b/trunk/kernel/sched_rt.c @@ -17,11 +17,6 @@ static inline int rt_overloaded(void) return atomic_read(&rto_count); } -static inline cpumask_t *rt_overload(void) -{ - return &rt_overload_mask; -} - static inline void rt_set_overload(struct rq *rq) { rq->rt.overloaded = 1; @@ -590,7 +585,6 @@ static int pull_rt_task(struct rq *this_rq) struct task_struct *next; struct task_struct *p; struct rq *src_rq; - cpumask_t *rto_cpumask; int this_cpu = this_rq->cpu; int cpu; int ret = 0; @@ -608,9 +602,7 @@ static int pull_rt_task(struct rq *this_rq) next = pick_next_task_rt(this_rq); - rto_cpumask = rt_overload(); - - for_each_cpu_mask(cpu, *rto_cpumask) { + for_each_cpu_mask(cpu, rt_overload_mask) { if (this_cpu == cpu) continue;