diff options
author | Paul Jackson <pj@sgi.com> | 2007-10-19 02:39:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 14:53:36 -0400 |
commit | c2e2c7fa1cb2cf2b114a6c9bc132b6601db5a7c8 (patch) | |
tree | 10527ddbb5c7198d35359c4f2823f95552ec6867 | |
parent | 006cb99200a38a8e3b0cbc1be48035a08921e601 (diff) |
task cgroups: enable cgroups by default in some configs
In pre-cgroup cpusets, a few config files enabled cpusets by default.
Signed-off-by: Paul Jackson <pj@sgi.com>
Cc: Paul Menage <menage@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/ia64/configs/sn2_defconfig | 1 | ||||
-rw-r--r-- | arch/mips/configs/ip27_defconfig | 1 | ||||
-rw-r--r-- | arch/mips/configs/sb1250-swarm_defconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/configs/cell_defconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/configs/pseries_defconfig | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig index 449d3e75bfc2..75fd90dc76a3 100644 --- a/arch/ia64/configs/sn2_defconfig +++ b/arch/ia64/configs/sn2_defconfig | |||
@@ -26,6 +26,7 @@ CONFIG_TASK_IO_ACCOUNTING=y | |||
26 | # CONFIG_AUDIT is not set | 26 | # CONFIG_AUDIT is not set |
27 | # CONFIG_IKCONFIG is not set | 27 | # CONFIG_IKCONFIG is not set |
28 | CONFIG_LOG_BUF_SHIFT=20 | 28 | CONFIG_LOG_BUF_SHIFT=20 |
29 | CONFIG_CGROUPS=y | ||
29 | CONFIG_CPUSETS=y | 30 | CONFIG_CPUSETS=y |
30 | CONFIG_SYSFS_DEPRECATED=y | 31 | CONFIG_SYSFS_DEPRECATED=y |
31 | CONFIG_RELAY=y | 32 | CONFIG_RELAY=y |
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig index 49bcc58929ba..892d4c38fd0d 100644 --- a/arch/mips/configs/ip27_defconfig +++ b/arch/mips/configs/ip27_defconfig | |||
@@ -175,6 +175,7 @@ CONFIG_POSIX_MQUEUE=y | |||
175 | CONFIG_IKCONFIG=y | 175 | CONFIG_IKCONFIG=y |
176 | CONFIG_IKCONFIG_PROC=y | 176 | CONFIG_IKCONFIG_PROC=y |
177 | CONFIG_LOG_BUF_SHIFT=15 | 177 | CONFIG_LOG_BUF_SHIFT=15 |
178 | CONFIG_CGROUPS=y | ||
178 | CONFIG_CPUSETS=y | 179 | CONFIG_CPUSETS=y |
179 | CONFIG_SYSFS_DEPRECATED=y | 180 | CONFIG_SYSFS_DEPRECATED=y |
180 | CONFIG_RELAY=y | 181 | CONFIG_RELAY=y |
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig index 3ed991ae0ebe..49dfcef2518c 100644 --- a/arch/mips/configs/sb1250-swarm_defconfig +++ b/arch/mips/configs/sb1250-swarm_defconfig | |||
@@ -196,6 +196,7 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
196 | # CONFIG_UTS_NS is not set | 196 | # CONFIG_UTS_NS is not set |
197 | # CONFIG_AUDIT is not set | 197 | # CONFIG_AUDIT is not set |
198 | # CONFIG_IKCONFIG is not set | 198 | # CONFIG_IKCONFIG is not set |
199 | CONFIG_CGROUPS=y | ||
199 | CONFIG_CPUSETS=y | 200 | CONFIG_CPUSETS=y |
200 | CONFIG_SYSFS_DEPRECATED=y | 201 | CONFIG_SYSFS_DEPRECATED=y |
201 | CONFIG_RELAY=y | 202 | CONFIG_RELAY=y |
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig index 8b47c846421c..dcd7c02727c2 100644 --- a/arch/powerpc/configs/cell_defconfig +++ b/arch/powerpc/configs/cell_defconfig | |||
@@ -68,6 +68,7 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
68 | CONFIG_IKCONFIG=y | 68 | CONFIG_IKCONFIG=y |
69 | CONFIG_IKCONFIG_PROC=y | 69 | CONFIG_IKCONFIG_PROC=y |
70 | CONFIG_LOG_BUF_SHIFT=15 | 70 | CONFIG_LOG_BUF_SHIFT=15 |
71 | CONFIG_CGROUPS=y | ||
71 | CONFIG_CPUSETS=y | 72 | CONFIG_CPUSETS=y |
72 | CONFIG_SYSFS_DEPRECATED=y | 73 | CONFIG_SYSFS_DEPRECATED=y |
73 | # CONFIG_RELAY is not set | 74 | # CONFIG_RELAY is not set |
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index bb8d4e46f0c5..05582af50c5b 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
@@ -71,6 +71,7 @@ CONFIG_TASK_DELAY_ACCT=y | |||
71 | CONFIG_IKCONFIG=y | 71 | CONFIG_IKCONFIG=y |
72 | CONFIG_IKCONFIG_PROC=y | 72 | CONFIG_IKCONFIG_PROC=y |
73 | CONFIG_LOG_BUF_SHIFT=17 | 73 | CONFIG_LOG_BUF_SHIFT=17 |
74 | CONFIG_CGROUPS=y | ||
74 | CONFIG_CPUSETS=y | 75 | CONFIG_CPUSETS=y |
75 | CONFIG_SYSFS_DEPRECATED=y | 76 | CONFIG_SYSFS_DEPRECATED=y |
76 | CONFIG_RELAY=y | 77 | CONFIG_RELAY=y |
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index c09eb8cfbe71..62a38406b62f 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig | |||
@@ -71,6 +71,7 @@ CONFIG_AUDITSYSCALL=y | |||
71 | CONFIG_IKCONFIG=y | 71 | CONFIG_IKCONFIG=y |
72 | CONFIG_IKCONFIG_PROC=y | 72 | CONFIG_IKCONFIG_PROC=y |
73 | CONFIG_LOG_BUF_SHIFT=17 | 73 | CONFIG_LOG_BUF_SHIFT=17 |
74 | CONFIG_CGROUPS=y | ||
74 | CONFIG_CPUSETS=y | 75 | CONFIG_CPUSETS=y |
75 | CONFIG_SYSFS_DEPRECATED=y | 76 | CONFIG_SYSFS_DEPRECATED=y |
76 | # CONFIG_RELAY is not set | 77 | # CONFIG_RELAY is not set |