From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756723AbcCaJ3L (ORCPT ); Thu, 31 Mar 2016 05:29:11 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38348 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752504AbcCaJ3I (ORCPT ); Thu, 31 Mar 2016 05:29:08 -0400 Date: Thu, 31 Mar 2016 02:28:26 -0700 From: tip-bot for Tim Chen Message-ID: Cc: mgorman@suse.de, hpa@zytor.com, peterz@infradead.org, tim.c.chen@linux.intel.com, efault@gmx.de, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, riel@redhat.com, mingo@kernel.org, tglx@linutronix.de Reply-To: tim.c.chen@linux.intel.com, peterz@infradead.org, hpa@zytor.com, mgorman@suse.de, mingo@kernel.org, riel@redhat.com, tglx@linutronix.de, torvalds@linux-foundation.org, efault@gmx.de, linux-kernel@vger.kernel.org, akpm@linux-foundation.org In-Reply-To: <1454366879.21738.29.camel@schen9-desk2.jf.intel.com> References: <1454366879.21738.29.camel@schen9-desk2.jf.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/numa: Remove unnecessary NUMA dequeue update from non-SMP kernels Git-Commit-ID: bfdb198ccd99472c5bded689699eb30dd06316bb X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: bfdb198ccd99472c5bded689699eb30dd06316bb Gitweb: http://git.kernel.org/tip/bfdb198ccd99472c5bded689699eb30dd06316bb Author: Tim Chen AuthorDate: Mon, 1 Feb 2016 14:47:59 -0800 Committer: Ingo Molnar CommitDate: Thu, 31 Mar 2016 10:49:45 +0200 sched/numa: Remove unnecessary NUMA dequeue update from non-SMP kernels In account_entity_enqueue(), we do not do account_numa_enqueue() as NUMA balancing is not needed for UP kernels. Hence, we should remove the account_numa_dequeue() call from account_entity_dequeue() for UP kernels. Signed-off-by: Tim Chen Signed-off-by: Peter Zijlstra (Intel) Cc: Linus Torvalds Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Linus Torvalds Cc: Andrew Morton Cc: Peter Zijlstra Cc: Rik van Riel Cc: Mel Gorman Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1454366879.21738.29.camel@schen9-desk2.jf.intel.com Signed-off-by: Ingo Molnar --- kernel/sched/fair.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index cbb075e..1fe9916 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -2437,10 +2437,12 @@ account_entity_dequeue(struct cfs_rq *cfs_rq, struct sched_entity *se) update_load_sub(&cfs_rq->load, se->load.weight); if (!parent_entity(se)) update_load_sub(&rq_of(cfs_rq)->load, se->load.weight); +#ifdef CONFIG_SMP if (entity_is_task(se)) { account_numa_dequeue(rq_of(cfs_rq), task_of(se)); list_del_init(&se->group_node); } +#endif cfs_rq->nr_running--; }