sched: Remove the sched_class load_balance methods
Commit-ID: 3d45fd804a95055ecab5b3eed81f5ab2dbb047a2 Gitweb: http://git.kernel.org/tip/3d45fd804a95055ecab5b3eed81f5ab2dbb047a2 Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 17 Dec 2009 17:12:46 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 21 Jan 2010 13:40:09 +0100
sched: Remove the sched_class load_balance methods
Take out the sched_class methods for load-balancing.
Signed-off-by Peter Zijlstra <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by Ingo Molnar <[email protected]>
--- include/linux/sched.h | 8 ----- kernel/sched.c | 26 ------------------ kernel/sched_fair.c | 66 ++++++++++++++++++++++++++-------------------- kernel/sched_idletask.c | 21 --------------- kernel/sched_rt.c | 20 -------------- 5 files changed, 37 insertions(+), 104 deletions(-)
include/linux/sched.h +0 -8
@@ -1087,14 +1087,6 @@ struct sched_class {#ifdef CONFIG_SMP int (*select_task_rq)(struct task_struct *p,int sd_flag,int flags); -unsigned long (*load_balance) (struct rq *this_rq,int this_cpu, -struct rq *busiest,unsigned long max_load_move, -struct sched_domain *sd,enum cpu_idle_type idle, -int *all_pinned,int *this_best_prio); - -int (*move_one_task) (struct rq *this_rq,int this_cpu, -struct rq *busiest,struct sched_domain *sd, -enum cpu_idle_type idle);void (*pre_schedule) (struct rq *this_rq,struct task_struct *task);void (*post_schedule) (struct rq *this_rq);void (*task_waking) (struct rq *this_rq,struct task_struct *task);
kernel/sched.c +0 -26
@@ -1390,32 +1390,6 @@ static const u32 prio_to_wmult[40] = { /* 15 */ 119304647, 148102320, 186737708, 238609294, 286331153, }; -static void activate_task (struct rq *rq,struct task_struct *p,int wakeup); - -/* -* runqueue iterator, to support SMP load-balancing between different -* scheduling classes, without having to expose their internal data -* structures to the load-balancing proper: -*/ -struct rq_iterator { -void *arg; -struct task_struct *(*start)(void *); -struct task_struct *(*next)(void *); -}; - -#ifdef CONFIG_SMP -static unsigned long -balance_tasks (struct rq *this_rq,int this_cpu,struct rq *busiest, -unsigned long max_load_move,struct sched_domain *sd, -enum cpu_idle_type idle,int *all_pinned, -int *this_best_prio,struct rq_iterator *iterator); - -static int -iter_move_one_task (struct rq *this_rq,int this_cpu,struct rq *busiest, -struct sched_domain *sd,enum cpu_idle_type idle, -struct rq_iterator *iterator); -#endif -/* Time spent by the tasks of the cpu accounting group executing in ... */ enum cpuacct_stat_index {CPUACCT_STAT_USER ,/* ... user mode */
kernel/sched_fair.c +37 -29
107 lines not on this page · raw message
kernel/sched_idletask.c +0 -21
@@ -44,24 +44,6 @@ static void put_prev_task_idle(struct rq *rq, struct task_struct *prev) { } -#ifdef CONFIG_SMP -static unsigned long -load_balance_idle (struct rq *this_rq,int this_cpu,struct rq *busiest, -unsigned long max_load_move, -struct sched_domain *sd,enum cpu_idle_type idle, -int *all_pinned,int *this_best_prio) -{ -return 0 ; -} - -static int -move_one_task_idle (struct rq *this_rq,int this_cpu,struct rq *busiest, -struct sched_domain *sd,enum cpu_idle_type idle) -{ -return 0 ; -} -#endif -static void task_tick_idle (struct rq *rq,struct task_struct *curr,int queued) { }
@@ -119,9 +101,6 @@ static const struct sched_class idle_sched_class = {#ifdef CONFIG_SMP .select_task_rq = select_task_rq_idle, - - .load_balance = load_balance_idle, - .move_one_task = move_one_task_idle, #endif .set_curr_task = set_curr_task_idle,
kernel/sched_rt.c +0 -20
@@ -1481,24 +1481,6 @@ static void task_woken_rt(struct rq *rq, struct task_struct *p)push_rt_tasks (rq); } -static unsigned long -load_balance_rt (struct rq *this_rq,int this_cpu,struct rq *busiest, -unsigned long max_load_move, -struct sched_domain *sd,enum cpu_idle_type idle, -int *all_pinned,int *this_best_prio) -{ -/* don't touch RT tasks */ -return 0 ; -} - -static int -move_one_task_rt (struct rq *this_rq,int this_cpu,struct rq *busiest, -struct sched_domain *sd,enum cpu_idle_type idle) -{ -/* don't touch RT tasks */ -return 0 ; -} -static void set_cpus_allowed_rt (struct task_struct *p,const struct cpumask *new_mask) {
@@ -1746,8 +1728,6 @@ static const struct sched_class rt_sched_class = {#ifdef CONFIG_SMP .select_task_rq = select_task_rq_rt, - .load_balance = load_balance_rt, - .move_one_task = move_one_task_rt, .set_cpus_allowed = set_cpus_allowed_rt, .rq_online = rq_online_rt, .rq_offline = rq_offline_rt,