From d81b54c4f4d585445a8ca1bbdd4736a56947e635 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Fri, 25 Jan 2008 21:08:15 +0100 Subject: [PATCH] --- yaml --- r: 76145 b: refs/heads/master c: deeeccd41bd94a9db133d7b923f9a7479a47305d h: refs/heads/master i: 76143: d555d499cd6a9d97f3e8785b0b35ad298d2a0730 v: v3 --- [refs] | 2 +- trunk/kernel/sched_rt.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 63119ba486b1..0e2e6e594744 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4df64c0bfb7e0e260d10ebc005f7d0ba1308eed7 +refs/heads/master: deeeccd41bd94a9db133d7b923f9a7479a47305d diff --git a/trunk/kernel/sched_rt.c b/trunk/kernel/sched_rt.c index 0749c1837b10..b591b89710a4 100644 --- a/trunk/kernel/sched_rt.c +++ b/trunk/kernel/sched_rt.c @@ -762,6 +762,7 @@ move_one_task_rt(struct rq *this_rq, int this_cpu, struct rq *busiest, /* don't touch RT tasks */ return 0; } + static void set_cpus_allowed_rt(struct task_struct *p, cpumask_t *new_mask) { int weight = cpus_weight(*new_mask); @@ -775,9 +776,9 @@ static void set_cpus_allowed_rt(struct task_struct *p, cpumask_t *new_mask) if (p->se.on_rq && (weight != p->nr_cpus_allowed)) { struct rq *rq = task_rq(p); - if ((p->nr_cpus_allowed <= 1) && (weight > 1)) + if ((p->nr_cpus_allowed <= 1) && (weight > 1)) { rq->rt.rt_nr_migratory++; - else if((p->nr_cpus_allowed > 1) && (weight <= 1)) { + } else if ((p->nr_cpus_allowed > 1) && (weight <= 1)) { BUG_ON(!rq->rt.rt_nr_migratory); rq->rt.rt_nr_migratory--; } @@ -788,6 +789,7 @@ static void set_cpus_allowed_rt(struct task_struct *p, cpumask_t *new_mask) p->cpus_allowed = *new_mask; p->nr_cpus_allowed = weight; } + #else /* CONFIG_SMP */ # define schedule_tail_balance_rt(rq) do { } while (0) # define schedule_balance_rt(rq, prev) do { } while (0)