aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-12-07 07:49:48 +0100
committerIngo Molnar <mingo@elte.hu>2010-12-07 07:49:51 +0100
commit10a18d7dc0d9f12483c95ffc234118e9b80edfeb (patch)
tree0f43620107d5231cab669bca4b3c923b721330c7 /init
parentf984ba4eb575e4a27ed28a76d4126d2aa9233c32 (diff)
parentcf7d7e5a1980d1116ee152d25dac382b112b9c17 (diff)
downloadlinux-2.6.38-lt-ux500-10a18d7dc0d9f12483c95ffc234118e9b80edfeb.tar.gz
Merge commit 'v2.6.37-rc5' into perf/core
Merge reason: Pick up the latest -rc. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig13
1 files changed, 13 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 88c10468db4..c9728992a77 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -613,6 +613,19 @@ config CGROUP_MEM_RES_CTLR_SWAP
if boot option "noswapaccount" is set, swap will not be accounted.
Now, memory usage of swap_cgroup is 2 bytes per entry. If swap page
size is 4096bytes, 512k per 1Gbytes of swap.
+config CGROUP_MEM_RES_CTLR_SWAP_ENABLED
+ bool "Memory Resource Controller Swap Extension enabled by default"
+ depends on CGROUP_MEM_RES_CTLR_SWAP
+ default y
+ help
+ Memory Resource Controller Swap Extension comes with its price in
+ a bigger memory consumption. General purpose distribution kernels
+ which want to enable the feautre but keep it disabled by default
+ and let the user enable it by swapaccount boot command line
+ parameter should have this option unselected.
+ For those who want to have the feature enabled by default should
+ select this option (if, for some reason, they need to disable it
+ then noswapaccount does the trick).
menuconfig CGROUP_SCHED
bool "Group CPU scheduler"