scheduler fixes
Subsystems (2)
Linus,
Please pull the latest sched-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git sched-fixes-for-linus
Thanks,
Ingo
------------------>
Borislav Petkov (1):
sched, doc: Update sched-design-CFS.txt
Jonathan Neuschäfer (1):
sched.h: Fix a typo ("its")
Randy Dunlap (1):
sched: Fix yield_to kernel-doc
Sergey Senozhatsky (1):
sched: Remove unused 'rq' variable and cpu_rq() call from alloc_fair_sched_group()
Documentation/scheduler/sched-design-CFS.txt | 7 +------ include/linux/sched.h | 2 +- kernel/sched.c | 5 ++--- kernel/sched_idletask.c | 2 -- kernel/sched_stoptask.c | 2 -- 5 files changed, 4 insertions(+), 14 deletions(-)
Documentation/scheduler/sched-design-CFS.txt +1 -6
@@ -164,7 +164,7 @@ This is the (partial) list of the hooks: It puts the scheduling entity (task) into the red-black tree and increments the nr_running variable. - - dequeue_tree(...) + - dequeue_task(...) When a task is no longer runnable, this function is called to keep the corresponding scheduling entity out of the red-black tree. It decrements
@@ -195,11 +195,6 @@ This is the (partial) list of the hooks: This function is mostly called from time tick functions; it might lead to process switch. This drives the running preemption. - - task_new(...) - - The core scheduler gives the scheduling module an opportunity to manage new - task startup. The CFS scheduling module uses it for group scheduling, while - the scheduling module for a real-time task does not use it.
include/linux/sched.h +1 -1
@@ -516,7 +516,7 @@ struct thread_group_cputimer {struct autogroup ;/* -* NOTE! "signal_struct" does not have it's own +* NOTE! "signal_struct" does not have its own * locking, because a shared signal_struct always * implies a shared sighand_struct, so locking * sighand_struct is always a proper superset of
kernel/sched.c +2 -3
@@ -5467,6 +5467,8 @@ EXPORT_SYMBOL(yield);* yield_to - yield the current processor to another thread in * your thread group, or accelerate that thread toward the * processor it's on. +* @p: target task +* @preempt: whether task preemption is allowed or not * * It's the caller's job to ensure that the target task struct * can't go away on us before we can do any checks.
@@ -8441,7 +8443,6 @@ int alloc_fair_sched_group(struct task_group *tg, struct task_group *parent) {struct cfs_rq *cfs_rq;struct sched_entity *se; -struct rq *rq;int i; tg->cfs_rq =kzalloc (sizeof (cfs_rq) * nr_cpu_ids,GFP_KERNEL );
@@ -8454,8 +8455,6 @@ int alloc_fair_sched_group(struct task_group *tg, struct task_group *parent) tg->shares =NICE_0_LOAD ;for_each_possible_cpu (i) { - rq =cpu_rq (i); - cfs_rq =kzalloc_node (sizeof (struct cfs_rq ),GFP_KERNEL ,cpu_to_node (i));if (!cfs_rq)
kernel/sched_idletask.c +0 -2
@@ -94,6 +94,4 @@ static const struct sched_class idle_sched_class = { .prio_changed = prio_changed_idle, .switched_to = switched_to_idle, - -/* no .task_new for idle tasks */ };
kernel/sched_stoptask.c +0 -2
@@ -102,6 +102,4 @@ static const struct sched_class stop_sched_class = { .prio_changed = prio_changed_stop, .switched_to = switched_to_stop, - -/* no .task_new for stop tasks */ };