diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-08 20:15:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-08 20:15:29 +0100 |
| commit | 8e9255e6a2141e050d51bc4d96dbef494a87d653 (patch) | |
| tree | f190b142830153eaab05555a93c4f71a144ba3d4 /init | |
| parent | 5091faa449ee0b7d73bc296a93bca9540fc51d0a (diff) | |
| parent | 6313e3c21743cc88bb5bd8aa72948ee1e83937b6 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: we want to queue up dependent cleanup
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index f1bba0a1b051..62b71491dde5 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" |