From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755182AbbIMLDV (ORCPT ); Sun, 13 Sep 2015 07:03:21 -0400 Received: from terminus.zytor.com ([198.137.202.10]:43461 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752255AbbIMLDT (ORCPT ); Sun, 13 Sep 2015 07:03:19 -0400 Date: Sun, 13 Sep 2015 04:02:40 -0700 From: tip-bot for Srikar Dronamraju Message-ID: Cc: srikar@linux.vnet.ibm.com, peterz@infradead.org, riel@redhat.com, torvalds@linux-foundation.org, mingo@kernel.org, efault@gmx.de, linux-kernel@vger.kernel.org, hpa@zytor.com, mgorman@suse.de, tglx@linutronix.de Reply-To: mgorman@suse.de, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, efault@gmx.de, mingo@kernel.org, torvalds@linux-foundation.org, srikar@linux.vnet.ibm.com, peterz@infradead.org, riel@redhat.com In-Reply-To: <1439290813-6683-4-git-send-email-srikar@linux.vnet.ibm.com> References: <1439290813-6683-4-git-send-email-srikar@linux.vnet.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/numa: Remove the NUMA sched_feature Git-Commit-ID: 2b49d84b259fc18e131026e5d38e7855352f71b9 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: 2b49d84b259fc18e131026e5d38e7855352f71b9 Gitweb: http://git.kernel.org/tip/2b49d84b259fc18e131026e5d38e7855352f71b9 Author: Srikar Dronamraju AuthorDate: Tue, 11 Aug 2015 16:30:13 +0530 Committer: Ingo Molnar CommitDate: Sun, 13 Sep 2015 09:52:53 +0200 sched/numa: Remove the NUMA sched_feature 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 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 Link: http://lkml.kernel.org/r/1439290813-6683-4-git-send-email-srikar@linux.vnet.ibm.com Signed-off-by: Ingo Molnar --- 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 ca665f8..e0bd88b 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2120,12 +2120,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 e6fd23b..edf5902 100644 --- a/kernel/sched/features.h +++ b/kernel/sched/features.h @@ -72,21 +72,5 @@ SCHED_FEAT(RT_PUSH_IPI, true) SCHED_FEAT(FORCE_SD_OVERLAP, false) SCHED_FEAT(RT_RUNTIME_SHARE, true) SCHED_FEAT(LB_MIN, false) - SCHED_FEAT(ATTACH_AGE_LOAD, true) -/* - * 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