From: Paul Jackson In pre-cgroup cpusets, a few config files enabled cpusets by default. Signed-off-by: Paul Jackson Cc: Paul Menage Signed-off-by: Andrew Morton --- arch/ia64/configs/sn2_defconfig | 1 + arch/mips/configs/ip27_defconfig | 1 + arch/mips/configs/sb1250-swarm_defconfig | 1 + arch/powerpc/configs/cell_defconfig | 1 + arch/powerpc/configs/ppc64_defconfig | 1 + arch/powerpc/configs/pseries_defconfig | 1 + 6 files changed, 6 insertions(+) diff -puN arch/ia64/configs/sn2_defconfig~task-cgroups-enable-cgroups-by-default-in-some-configs arch/ia64/configs/sn2_defconfig --- a/arch/ia64/configs/sn2_defconfig~task-cgroups-enable-cgroups-by-default-in-some-configs +++ a/arch/ia64/configs/sn2_defconfig @@ -27,6 +27,7 @@ CONFIG_TASKSTATS=y # CONFIG_UTS_NS is not set # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set +CONFIG_CGROUPS=y CONFIG_CPUSETS=y CONFIG_RELAY=y CONFIG_INITRAMFS_SOURCE="" diff -puN arch/mips/configs/ip27_defconfig~task-cgroups-enable-cgroups-by-default-in-some-configs arch/mips/configs/ip27_defconfig --- a/arch/mips/configs/ip27_defconfig~task-cgroups-enable-cgroups-by-default-in-some-configs +++ a/arch/mips/configs/ip27_defconfig @@ -175,6 +175,7 @@ CONFIG_POSIX_MQUEUE=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=15 +CONFIG_CGROUPS=y CONFIG_CPUSETS=y CONFIG_SYSFS_DEPRECATED=y CONFIG_RELAY=y diff -puN arch/mips/configs/sb1250-swarm_defconfig~task-cgroups-enable-cgroups-by-default-in-some-configs arch/mips/configs/sb1250-swarm_defconfig --- a/arch/mips/configs/sb1250-swarm_defconfig~task-cgroups-enable-cgroups-by-default-in-some-configs +++ a/arch/mips/configs/sb1250-swarm_defconfig @@ -197,6 +197,7 @@ CONFIG_SYSVIPC_SYSCTL=y # CONFIG_UTS_NS is not set # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set +CONFIG_CGROUPS=y CONFIG_CPUSETS=y CONFIG_SYSFS_DEPRECATED=y CONFIG_RELAY=y diff -puN arch/powerpc/configs/cell_defconfig~task-cgroups-enable-cgroups-by-default-in-some-configs arch/powerpc/configs/cell_defconfig --- a/arch/powerpc/configs/cell_defconfig~task-cgroups-enable-cgroups-by-default-in-some-configs +++ a/arch/powerpc/configs/cell_defconfig @@ -68,6 +68,7 @@ CONFIG_SYSVIPC_SYSCTL=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=15 +CONFIG_CGROUPS=y CONFIG_CPUSETS=y CONFIG_SYSFS_DEPRECATED=y # CONFIG_RELAY is not set diff -puN arch/powerpc/configs/ppc64_defconfig~task-cgroups-enable-cgroups-by-default-in-some-configs arch/powerpc/configs/ppc64_defconfig --- a/arch/powerpc/configs/ppc64_defconfig~task-cgroups-enable-cgroups-by-default-in-some-configs +++ a/arch/powerpc/configs/ppc64_defconfig @@ -71,6 +71,7 @@ CONFIG_TASK_DELAY_ACCT=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=17 +CONFIG_CGROUPS=y CONFIG_CPUSETS=y CONFIG_SYSFS_DEPRECATED=y CONFIG_RELAY=y diff -puN arch/powerpc/configs/pseries_defconfig~task-cgroups-enable-cgroups-by-default-in-some-configs arch/powerpc/configs/pseries_defconfig --- a/arch/powerpc/configs/pseries_defconfig~task-cgroups-enable-cgroups-by-default-in-some-configs +++ a/arch/powerpc/configs/pseries_defconfig @@ -71,6 +71,7 @@ CONFIG_AUDITSYSCALL=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=17 +CONFIG_CGROUPS=y CONFIG_CPUSETS=y CONFIG_SYSFS_DEPRECATED=y # CONFIG_RELAY is not set _