[PATCH] RT: fix uniprocessor build issue with new scheduler enhancements
From: Gregory Haskins <hidden>
Date: 2007-11-07 14:20:15
Subsystem:
the rest · Maintainer:
Linus Torvalds
Primary issue is cpupri_init() is not defined, but also clean up some warnings related to uniproc builds. Signed-off-by: Gregory Haskins <redacted> CC: Dragan Noveski <redacted> --- kernel/sched.c | 2 ++ kernel/sched_cpupri.h | 5 +++++ kernel/sched_rt.c | 2 +- 3 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/kernel/sched.c b/kernel/sched.c
index 6f24aa0..365c987 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c@@ -863,9 +863,11 @@ static int balance_tasks(struct rq *this_rq, int this_cpu, struct rq *busiest, int *all_pinned, unsigned long *load_moved, int *this_best_prio, struct rq_iterator *iterator); +#ifdef CONFIG_SMP static unsigned long source_load(int cpu, int type); static unsigned long target_load(int cpu, int type); static unsigned long cpu_avg_load_per_task(int cpu); +#endif /* CONFIG_SMP */ #include "sched_stats.h" #include "sched_rt.c"
diff --git a/kernel/sched_cpupri.h b/kernel/sched_cpupri.h
index 8cdd15d..2119495 100644
--- a/kernel/sched_cpupri.h
+++ b/kernel/sched_cpupri.h@@ -5,6 +5,11 @@ int cpupri_find(struct task_struct *p, cpumask_t *lowest_mask); void cpupri_set(int cpu, int pri); + +#ifdef CONFIG_SMP void cpupri_init(void); +#else +#define cpupri_init() do { } while(0) +#endif #endif /* _LINUX_CPUPRI_H */
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c
index 71ae9e6..0213aa2 100644
--- a/kernel/sched_rt.c
+++ b/kernel/sched_rt.c@@ -207,9 +207,9 @@ yield_task_rt(struct rq *rq, struct task_struct *p) requeue_task_rt(rq, p); } +#ifdef CONFIG_SMP static int find_lowest_rq(struct task_struct *task); -#ifdef CONFIG_SMP static int select_task_rq_rt(struct task_struct *p, int sync) { struct rq *rq = task_rq(p);