From 54c9bb6245125c53b871ffd01b3139edcb9b87ab Mon Sep 17 00:00:00 2001 From: Yong Zhang Date: Fri, 29 Jan 2010 14:57:52 +0800 Subject: [PATCH] --- yaml --- r: 182515 b: refs/heads/master c: 74b7eb5885415ed41d012f432398d1b697115b5f h: refs/heads/master i: 182513: b2977739b7583412b8ad25bf988ef6c00d8bffb6 182511: ce7ff1d7b70989e4914f6f25aca6f3644a1ee26a v: v3 --- [refs] | 2 +- trunk/kernel/sched_rt.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8bfaa5e5035e..adea5b5af9a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a461c85b643258e305eb5a3aced34009db2f818 +refs/heads/master: 74b7eb5885415ed41d012f432398d1b697115b5f diff --git a/trunk/kernel/sched_rt.c b/trunk/kernel/sched_rt.c index ca49ceb01201..bf3e38fdbe6d 100644 --- a/trunk/kernel/sched_rt.c +++ b/trunk/kernel/sched_rt.c @@ -199,8 +199,11 @@ static void dequeue_rt_entity(struct sched_rt_entity *rt_se); static void sched_rt_rq_enqueue(struct rt_rq *rt_rq) { + int this_cpu = smp_processor_id(); struct task_struct *curr = rq_of_rt_rq(rt_rq)->curr; - struct sched_rt_entity *rt_se = rt_rq->rt_se; + struct sched_rt_entity *rt_se; + + rt_se = rt_rq->tg->rt_se[this_cpu]; if (rt_rq->rt_nr_running) { if (rt_se && !on_rt_rq(rt_se)) @@ -212,7 +215,10 @@ static void sched_rt_rq_enqueue(struct rt_rq *rt_rq) static void sched_rt_rq_dequeue(struct rt_rq *rt_rq) { - struct sched_rt_entity *rt_se = rt_rq->rt_se; + int this_cpu = smp_processor_id(); + struct sched_rt_entity *rt_se; + + rt_se = rt_rq->tg->rt_se[this_cpu]; if (rt_se && on_rt_rq(rt_se)) dequeue_rt_entity(rt_se);