Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

[~andy/linux] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 14c483d2b7c90b4a5713b6ed116fa16260f1228d..1398a14b01919d500c59367ff5cffd61d9f39cad 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -531,7 +531,7 @@ config CGROUP_DEVICE
 
 config CPUSETS
        bool "Cpuset support"
-       depends on SMP && CGROUPS
+       depends on CGROUPS
        help
          This option will let you create and manage CPUSETs which
          allow dynamically partitioning a system into sets of CPUs and
@@ -597,6 +597,8 @@ config CGROUP_MEM_RES_CTLR_SWAP
          is disabled by boot option, this will be automatically disabled and
          there will be no overhead from this. Even when you set this config=y,
          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.
 
 endif # CGROUPS