The following commit has been merged into the sched/core branch of tip: Commit-ID: 1d1c2509de4488cc58c924d0a6117c62de1d4f9c Gitweb: https://git.kernel.org/tip/1d1c2509de4488cc58c924d0a6117c62de1d4f9c Author: Peter Zijlstra <pet...@infradead.org> AuthorDate: Wed, 24 Mar 2021 19:47:43 +01:00 Committer: Peter Zijlstra <pet...@infradead.org> CommitterDate: Fri, 16 Apr 2021 17:06:33 +02:00
sched: Remove sched_schedstats sysctl out from under SCHED_DEBUG CONFIG_SCHEDSTATS does not depend on SCHED_DEBUG, it is inconsistent to have the sysctl depend on it. Suggested-by: Mel Gorman <mgor...@suse.de> Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org> Tested-by: Valentin Schneider <valentin.schnei...@arm.com> Link: https://lkml.kernel.org/r/20210412102001.161151...@infradead.org --- kernel/sysctl.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 8042098..17f1cc9 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1711,17 +1711,6 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = proc_dointvec, }, -#ifdef CONFIG_SCHEDSTATS - { - .procname = "sched_schedstats", - .data = NULL, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = sysctl_schedstats, - .extra1 = SYSCTL_ZERO, - .extra2 = SYSCTL_ONE, - }, -#endif /* CONFIG_SCHEDSTATS */ #endif /* CONFIG_SMP */ #ifdef CONFIG_NUMA_BALANCING { @@ -1755,6 +1744,17 @@ static struct ctl_table kern_table[] = { }, #endif /* CONFIG_NUMA_BALANCING */ #endif /* CONFIG_SCHED_DEBUG */ +#ifdef CONFIG_SCHEDSTATS + { + .procname = "sched_schedstats", + .data = NULL, + .maxlen = sizeof(unsigned int), + .mode = 0644, + .proc_handler = sysctl_schedstats, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE, + }, +#endif /* CONFIG_SCHEDSTATS */ #ifdef CONFIG_NUMA_BALANCING { .procname = "numa_balancing",
