sched: Consolidate select_task_rq() callers
Commit-ID: 970b13bacba14a8cef6f642861947df1d175b0b3 Gitweb: http://git.kernel.org/tip/970b13bacba14a8cef6f642861947df1d175b0b3 Author: Peter Zijlstra <[email protected]> AuthorDate: Wed, 25 Nov 2009 13:31:39 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 9 Dec 2009 10:03:02 +0100
sched: Consolidate select_task_rq() callers
Small cleanup.
Signed-off-by Peter Zijlstra <[email protected]>
LKML-Reference: <new-submission>
[ v2: build fix ]
Signed-off-by Ingo Molnar <[email protected]>
--- kernel/sched.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-)
kernel/sched.c +11 -3
@@ -2323,6 +2323,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
@@ -2376,7 +2384,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) {local_irq_save (flags); rq =cpu_rq (cpu);
@@ -2593,7 +2601,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 local_irq_save (flags);update_rq_clock (cpu_rq (cpu));
@@ -3156,7 +3164,7 @@ out: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);