From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751325AbbJBCTg (ORCPT ); Thu, 1 Oct 2015 22:19:36 -0400 Received: from e23smtp07.au.ibm.com ([202.81.31.140]:49358 "EHLO e23smtp07.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751063AbbJBCTe (ORCPT ); Thu, 1 Oct 2015 22:19:34 -0400 X-Helo: d23dlp01.au.ibm.com X-MailFrom: srikar@linux.vnet.ibm.com X-RcptTo: linux-kernel@vger.kernel.org From: Srikar Dronamraju To: Ingo Molnar , Peter Zijlstra Cc: linux-kernel@vger.kernel.org, srikar@linux.vnet.ibm.com, Rik van Riel , Mel Gorman Subject: [PATCH] sched: Fix task_tick_fair from disabling numa_balancing Date: Fri, 2 Oct 2015 07:48:25 +0530 Message-Id: <1443752305-27413-1-git-send-email-srikar@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.4 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15100202-0025-0000-0000-0000023944B8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If static branch sched_numa_balancing is enabled, it should kickstart numa_balancing through task_tick_numa(). However Commit 2a1ed24 ("sched/numa: Convert sched_numa_balancing to a static_branch") erroneously disables this. Fix this anomaly by enabling task_tick_numa when static branch sched_numa_balancing is enabled. Signed-off-by: Srikar Dronamraju --- 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); } -- 2.1.4