From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934146AbbHKLBm (ORCPT ); Tue, 11 Aug 2015 07:01:42 -0400 Received: from e23smtp04.au.ibm.com ([202.81.31.146]:48355 "EHLO e23smtp04.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934115AbbHKLBk (ORCPT ); Tue, 11 Aug 2015 07:01:40 -0400 X-Helo: d23dlp02.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 v2 3/3] sched/numa: Remove NUMA sched feature Date: Tue, 11 Aug 2015 16:30:13 +0530 Message-Id: <1439290813-6683-4-git-send-email-srikar@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1439290813-6683-1-git-send-email-srikar@linux.vnet.ibm.com> References: <1439290813-6683-1-git-send-email-srikar@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15081111-0013-0000-0000-000001BB6ADB Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Variable sched_numa_balancing is available for both CONFIG_SCHED_DEBUG and !CONFIG_SCHED_DEBUG. All code paths now check for sched_numa_balancing. Hence remove sched_feat(NUMA). Suggested-by: Ingo Molnar Signed-off-by: Srikar Dronamraju --- kernel/sched/core.c | 6 ------ kernel/sched/features.h | 16 ---------------- 2 files changed, 22 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 7cbdf44..d02570b 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2063,12 +2063,6 @@ __read_mostly bool sched_numa_balancing; void set_numabalancing_state(bool enabled) { sched_numa_balancing = enabled; -#ifdef CONFIG_SCHED_DEBUG - if (enabled) - sched_feat_set("NUMA"); - else - sched_feat_set("NO_NUMA"); -#endif /* CONFIG_SCHED_DEBUG */ } #ifdef CONFIG_PROC_SYSCTL diff --git a/kernel/sched/features.h b/kernel/sched/features.h index 83a50e7..8baa708 100644 --- a/kernel/sched/features.h +++ b/kernel/sched/features.h @@ -72,19 +72,3 @@ SCHED_FEAT(RT_PUSH_IPI, true) SCHED_FEAT(FORCE_SD_OVERLAP, false) SCHED_FEAT(RT_RUNTIME_SHARE, true) SCHED_FEAT(LB_MIN, false) - -/* - * Apply the automatic NUMA scheduling policy. Enabled automatically - * at runtime if running on a NUMA machine. Can be controlled via - * numa_balancing= - */ -#ifdef CONFIG_NUMA_BALANCING - -/* - * NUMA will favor moving tasks towards nodes where a higher number of - * hinting faults are recorded during active load balancing. It will - * resist moving tasks towards nodes where a lower number of hinting - * faults have been recorded. - */ -SCHED_FEAT(NUMA, true) -#endif -- 1.8.3.1