summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorMichal Hocko <mhocko@suse.cz>2013-08-23 01:35:46 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2013-08-23 18:51:22 +0200
commit07555ac144bbf45b1751340c6ee75da1f4e5756d (patch)
treea2e1ef0f4ab35a078c1dfb604cccba30ddf7dfc0 /init
parentnilfs2: fix issue with counting number of bio requests for BIO_EOPNOTSUPP err... (diff)
downloadlinux-07555ac144bbf45b1751340c6ee75da1f4e5756d.tar.xz
linux-07555ac144bbf45b1751340c6ee75da1f4e5756d.zip
memcg: get rid of swapaccount leftovers
The swapaccount kernel parameter without any values has been removed by commit a2c8990aed5a ("memsw: remove noswapaccount kernel parameter") but it seems that we didn't get rid of all the left overs. Make sure that menuconfig help text and kernel-parameters.txt are clear about value for the paramter and remove the stalled comment which is not very much useful on its own. Signed-off-by: Michal Hocko <mhocko@suse.cz> Reported-by: Gergely Risko <gergely@risko.hu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 247084be0590..fed81b576f29 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -955,7 +955,7 @@ config MEMCG_SWAP_ENABLED
Memory Resource Controller Swap Extension comes with its price in
a bigger memory consumption. General purpose distribution kernels
which want to enable the feature but keep it disabled by default
- and let the user enable it by swapaccount boot command line
+ and let the user enable it by swapaccount=1 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