sched: fix sched_rt.c:join/leave_domain
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>
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c
index b049e51..3ea0cae 100644
--- a/kernel/sched_rt.c
+++ b/kernel/sched_rt.c
@@ -767,6 +767,20 @@
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)
@@ -799,20 +813,6 @@
}
}
-/* 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;
@@ -838,11 +838,10 @@
.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,
};