From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752708Ab0LXMm3 (ORCPT ); Fri, 24 Dec 2010 07:42:29 -0500 Received: from canuck.infradead.org ([134.117.69.58]:54539 "EHLO canuck.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752582Ab0LXMmZ (ORCPT ); Fri, 24 Dec 2010 07:42:25 -0500 Message-Id: <20101224123743.253497432@chello.nl> User-Agent: quilt/0.48-1 Date: Fri, 24 Dec 2010 13:23:53 +0100 From: Peter Zijlstra To: Chris Mason , Frank Rowand , Ingo Molnar , Thomas Gleixner , Mike Galbraith , Oleg Nesterov , Paul Turner , Jens Axboe , Yong Zhang Cc: linux-kernel@vger.kernel.org, Peter Zijlstra Subject: [RFC][PATCH 15/17] sched: Rename ttwu_post_activation References: <20101224122338.172750730@chello.nl> Content-Disposition: inline; filename=sched-ttwu_do_wakeup.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The ttwu_post_actication() does the core wakeup, it sets TASK_RUNNING and performs wakeup-preemption, so give is a more descriptive name. Signed-off-by: Peter Zijlstra --- kernel/sched.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) Index: linux-2.6/kernel/sched.c =================================================================== --- linux-2.6.orig/kernel/sched.c +++ linux-2.6/kernel/sched.c @@ -2399,8 +2399,11 @@ ttwu_stat(struct task_struct *p, int cpu #endif /* CONFIG_SCHEDSTATS */ } +/* + * Mark the task runnable and perform wakeup-preemption. + */ static void -ttwu_post_activation(struct task_struct *p, struct rq *rq, int wake_flags) +ttwu_do_wakeup(struct rq *rq, struct task_struct *p, int wake_flags) { trace_sched_wakeup(p, true); check_preempt_curr(rq, p, wake_flags); @@ -2492,7 +2495,7 @@ try_to_wake_up(struct task_struct *p, un activate_task(rq, p, ENQUEUE_WAKEUP | ENQUEUE_WAKING); out_running: - ttwu_post_activation(p, rq, wake_flags); + ttwu_do_wakeup(rq, p, wake_flags); success = 1; __task_rq_unlock(rq); @@ -2529,7 +2532,7 @@ static void try_to_wake_up_local(struct if (!p->on_rq) activate_task(rq, p, ENQUEUE_WAKEUP); - ttwu_post_activation(p, rq, 0); + ttwu_do_wakeup(rq, p, 0); ttwu_stat(p, smp_processor_id(), 0); out: raw_spin_unlock(&p->pi_lock);