Commit a5f9d126 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Greg Kroah-Hartman

sched: Consolidate select_task_rq() callers

commit 970b13ba upstream

sched: Consolidate select_task_rq() callers

Small cleanup.
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <new-submission>
[ v2: build fix ]
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarMike Galbraith <efault@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 34d1f22e
......@@ -2333,6 +2333,14 @@ void task_oncpu_function_call(struct task_struct *p,
preempt_enable();
}
#ifdef CONFIG_SMP
static inline
int select_task_rq(struct task_struct *p, int sd_flags, int wake_flags)
{
return p->sched_class->select_task_rq(p, sd_flags, wake_flags);
}
#endif
/***
* try_to_wake_up - wake up a thread
* @p: the to-be-woken-up thread
......@@ -2386,7 +2394,7 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state,
p->state = TASK_WAKING;
task_rq_unlock(rq, &flags);
cpu = p->sched_class->select_task_rq(p, SD_BALANCE_WAKE, wake_flags);
cpu = select_task_rq(p, SD_BALANCE_WAKE, wake_flags);
if (cpu != orig_cpu)
set_task_cpu(p, cpu);
......@@ -2601,7 +2609,7 @@ void sched_fork(struct task_struct *p, int clone_flags)
p->sched_class = &fair_sched_class;
#ifdef CONFIG_SMP
cpu = p->sched_class->select_task_rq(p, SD_BALANCE_FORK, 0);
cpu = select_task_rq(p, SD_BALANCE_FORK, 0);
#endif
set_task_cpu(p, cpu);
......@@ -3170,7 +3178,7 @@ static void sched_migrate_task(struct task_struct *p, int dest_cpu)
void sched_exec(void)
{
int new_cpu, this_cpu = get_cpu();
new_cpu = current->sched_class->select_task_rq(current, SD_BALANCE_EXEC, 0);
new_cpu = select_task_rq(current, SD_BALANCE_EXEC, 0);
put_cpu();
if (new_cpu != this_cpu)
sched_migrate_task(current, new_cpu);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment