From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752935AbbJFQRt (ORCPT ); Tue, 6 Oct 2015 12:17:49 -0400 Received: from terminus.zytor.com ([198.137.202.10]:34798 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751443AbbJFQRq (ORCPT ); Tue, 6 Oct 2015 12:17:46 -0400 Date: Tue, 6 Oct 2015 09:17:03 -0700 From: tip-bot for Srikar Dronamraju Message-ID: Cc: peterz@infradead.org, efault@gmx.de, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, mingo@kernel.org, srikar@linux.vnet.ibm.com, hpa@zytor.com, tglx@linutronix.de, riel@redhat.com, mgorman@suse.de Reply-To: linux-kernel@vger.kernel.org, efault@gmx.de, peterz@infradead.org, mgorman@suse.de, riel@redhat.com, tglx@linutronix.de, hpa@zytor.com, srikar@linux.vnet.ibm.com, mingo@kernel.org, torvalds@linux-foundation.org In-Reply-To: <1443752305-27413-1-git-send-email-srikar@linux.vnet.ibm.com> References: <1443752305-27413-1-git-send-email-srikar@linux.vnet.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/numa: Fix task_tick_fair() from disabling numa_balancing Git-Commit-ID: b52da86e0ad58f096710977fcda856fd84da9233 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: b52da86e0ad58f096710977fcda856fd84da9233 Gitweb: http://git.kernel.org/tip/b52da86e0ad58f096710977fcda856fd84da9233 Author: Srikar Dronamraju AuthorDate: Fri, 2 Oct 2015 07:48:25 +0530 Committer: Ingo Molnar CommitDate: Tue, 6 Oct 2015 17:08:21 +0200 sched/numa: Fix task_tick_fair() from disabling numa_balancing If static branch 'sched_numa_balancing' is enabled, it should kickstart NUMA balancing through task_tick_numa(). However the following commit: 2a595721a1fa ("sched/numa: Convert sched_numa_balancing to a static_branch") erroneously disables this. Fix this anomaly by enabling task_tick_numa() when the static branch 'sched_numa_balancing' is enabled. Signed-off-by: Srikar Dronamraju Signed-off-by: Peter Zijlstra (Intel) Cc: Linus Torvalds Cc: Mel Gorman Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Rik van Riel Cc: Thomas Gleixner Cc: linux-kernel@vger.kernel.org Link: http://lkml.kernel.org/r/1443752305-27413-1-git-send-email-srikar@linux.vnet.ibm.com Signed-off-by: Ingo Molnar --- kernel/sched/fair.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 4df37a4..3bdc3da 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -7881,7 +7881,7 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr, int queued) entity_tick(cfs_rq, se, queued); } - if (!static_branch_unlikely(&sched_numa_balancing)) + if (static_branch_unlikely(&sched_numa_balancing)) task_tick_numa(rq, curr); }