scheduler fixes
Subsystems (2)
Linus, please pull the latest scheduler fixes git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel.git for-linus
Thanks,
Ingo
------------------>
Peter Zijlstra (1):
sched: revert load_balance_monitor() changes
include/linux/sched.h | 4 - kernel/sched.c | 283 ++++++------------------------------------------- kernel/sched_fair.c | 115 ++++++-------------- kernel/sched_rt.c | 4 - kernel/sysctl.c | 18 --- 5 files changed, 70 insertions(+), 354 deletions(-)
include/linux/sched.h +0 -4
@@ -1542,10 +1542,6 @@ extern unsigned int sysctl_sched_child_runs_first;extern unsigned int sysctl_sched_features;extern unsigned int sysctl_sched_migration_cost;extern unsigned int sysctl_sched_nr_migrate; -#if defined(CONFIG_FAIR_GROUP_SCHED ) && defined(CONFIG_SMP ) -extern unsigned int sysctl_sched_min_bal_int_shares; -extern unsigned int sysctl_sched_max_bal_int_shares; -#endif int sched_nr_latency_handler(struct ctl_table *table, int write, struct file *file, void __user *buffer, size_t *length,
kernel/sched.c +35 -248
399 lines not on this page · raw message
kernel/sched_fair.c +35 -80
181 lines not on this page · raw message
kernel/sched_rt.c +0 -4
@@ -393,8 +393,6 @@ static void enqueue_task_rt(struct rq *rq, struct task_struct *p, int wakeup)*/ for_each_sched_rt_entity (rt_se)enqueue_rt_entity (rt_se); - -inc_cpu_load (rq, p->se.load.weight); }static void dequeue_task_rt (struct rq *rq,struct task_struct *p,int sleep)
@@ -414,8 +412,6 @@ static void dequeue_task_rt(struct rq *rq, struct task_struct *p, int sleep)if (rt_rq && rt_rq->rt_nr_running)enqueue_rt_entity (rt_se); } - -dec_cpu_load (rq, p->se.load.weight); }/*
kernel/sysctl.c +0 -18
@@ -311,24 +311,6 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = &proc_dointvec, }, -#if defined(CONFIG_FAIR_GROUP_SCHED) && defined(CONFIG_SMP) - { - .ctl_name = CTL_UNNUMBERED, - .procname = "sched_min_bal_int_shares", - .data = &sysctl_sched_min_bal_int_shares, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = &proc_dointvec, - }, - { - .ctl_name = CTL_UNNUMBERED, - .procname = "sched_max_bal_int_shares", - .data = &sysctl_sched_max_bal_int_shares, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = &proc_dointvec, - }, -#endif#endif { .ctl_name = CTL_UNNUMBERED,