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"