From cfde1e0c4c3fb8adaf4671ba07a77328a44b1ae4 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 19 Sep 2010 00:55:19 +0000 Subject: [PATCH] Remove obsolete GROUP_SCHED and USER_SCHED config options svn path=/dists/trunk/linux-2.6/; revision=16318 --- debian/config/config | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/debian/config/config b/debian/config/config index b51f34695..eb503b833 100644 --- a/debian/config/config +++ b/debian/config/config @@ -3345,13 +3345,6 @@ CONFIG_RCU_FANOUT=32 CONFIG_RCU_FAST_NO_HZ=y # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=17 -CONFIG_GROUP_SCHED=y -CONFIG_FAIR_GROUP_SCHED=y -# CONFIG_RT_GROUP_SCHED is not set -## choice: Basis for grouping tasks -# CONFIG_USER_SCHED is not set -CONFIG_CGROUP_SCHED=y -## end choice CONFIG_CGROUPS=y # CONFIG_CGROUP_DEBUG is not set CONFIG_CGROUP_NS=y @@ -3361,6 +3354,9 @@ CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_CPUACCT=y # CONFIG_RESOURCE_COUNTERS is not set +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +# CONFIG_RT_GROUP_SCHED is not set CONFIG_BLK_CGROUP=y # CONFIG_DEBUG_BLK_CGROUP is not set # CONFIG_SYSFS_DEPRECATED_V2 is not set