Skip to content

Commit

Permalink
sched: fix sched_rt.c:join/leave_domain
Browse files Browse the repository at this point in the history
fix build bug in sched_rt.c:join/leave_domain and make them only
be included on SMP builds.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Ingo Molnar committed Jan 25, 2008
1 parent 637f508 commit bdd7c81
Showing 1 changed file with 16 additions and 17 deletions.
33 changes: 16 additions & 17 deletions kernel/sched_rt.c
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,20 @@ static void set_cpus_allowed_rt(struct task_struct *p, cpumask_t *new_mask)
p->nr_cpus_allowed = weight;
}

/* Assumes rq->lock is held */
static void join_domain_rt(struct rq *rq)
{
if (rq->rt.overloaded)
rt_set_overload(rq);
}

/* Assumes rq->lock is held */
static void leave_domain_rt(struct rq *rq)
{
if (rq->rt.overloaded)
rt_clear_overload(rq);
}

#else /* CONFIG_SMP */
# define schedule_tail_balance_rt(rq) do { } while (0)
# define schedule_balance_rt(rq, prev) do { } while (0)
Expand Down Expand Up @@ -799,20 +813,6 @@ static void task_tick_rt(struct rq *rq, struct task_struct *p)
}
}

/* Assumes rq->lock is held */
static void join_domain_rt(struct rq *rq)
{
if (rq->rt.overloaded)
rt_set_overload(rq);
}

/* Assumes rq->lock is held */
static void leave_domain_rt(struct rq *rq)
{
if (rq->rt.overloaded)
rt_clear_overload(rq);
}

static void set_curr_task_rt(struct rq *rq)
{
struct task_struct *p = rq->curr;
Expand All @@ -838,11 +838,10 @@ const struct sched_class rt_sched_class = {
.load_balance = load_balance_rt,
.move_one_task = move_one_task_rt,
.set_cpus_allowed = set_cpus_allowed_rt,
.join_domain = join_domain_rt,
.leave_domain = leave_domain_rt,
#endif

.set_curr_task = set_curr_task_rt,
.task_tick = task_tick_rt,

.join_domain = join_domain_rt,
.leave_domain = leave_domain_rt,
};

0 comments on commit bdd7c81

Please sign in to comment.