Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753530AbcCAMB6 (ORCPT ); Tue, 1 Mar 2016 07:01:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52726 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753447AbcCAMB4 (ORCPT ); Tue, 1 Mar 2016 07:01:56 -0500 From: Alexander Gordeev To: linux-kernel@vger.kernel.org Cc: Alexander Gordeev , Oleg Nesterov , Peter Zijlstra Subject: [PATCH v2 2/2] sched/core: Get rid of 'cpu' variable in __schedule() Date: Tue, 1 Mar 2016 13:01:42 +0100 Message-Id: <37225565296cf09eab30842f77dfb31ef56379e2.1456825203.git.agordeev@redhat.com> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1036 Lines: 36 'cpu' variable is only used to acquire the current runqueue. By using this_rq() instead, we can get rid of that variable. Cc: Oleg Nesterov Cc: Peter Zijlstra Signed-off-by: Alexander Gordeev --- kernel/sched/core.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 4e56a4d..82206f0 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3205,10 +3205,8 @@ static void __sched notrace __schedule(bool preempt) struct task_struct *prev, *next; unsigned long *switch_count; struct rq *rq; - int cpu; - cpu = smp_processor_id(); - rq = cpu_rq(cpu); + rq = this_rq(); prev = rq->curr; /* @@ -3280,7 +3278,6 @@ static void __sched notrace __schedule(bool preempt) trace_sched_switch(preempt, prev, next); rq = context_switch(rq, prev, next); /* unlocks the rq */ - cpu = cpu_of(rq); } else { lockdep_unpin_lock(&rq->lock); raw_spin_unlock_irq(&rq->lock); -- 1.8.3.1