lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

memcg: get rid of swapaccount leftovers

Browse Source 
The swapaccount kernel parameter without any values has been removed by
commit a2c8990aed ("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>
This commit is contained in:
Michal Hocko
2013-08-22 16:35:46 -07:00
committed by Linus Torvalds
parent 4bf93b50fd
commit 07555ac144
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/kernel-parameters.txt
View File

@@ -2953,7 +2953,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
improve throughput, but will also increase the improve throughput, but will also increase the
amount of memory reserved for use by the client. amount of memory reserved for use by the client.
swapaccount[=0|1] swapaccount=[0|1]
[KNL] Enable accounting of swap in memory resource [KNL] Enable accounting of swap in memory resource
controller if no parameter or 1 is given or disable controller if no parameter or 1 is given or disable
it if 0 is given (See Documentation/cgroups/memory.txt) it if 0 is given (See Documentation/cgroups/memory.txt)

2
init/Kconfig
View File

@@ -955,7 +955,7 @@ config MEMCG_SWAP_ENABLED
Memory Resource Controller Swap Extension comes with its price in Memory Resource Controller Swap Extension comes with its price in
a bigger memory consumption. General purpose distribution kernels a bigger memory consumption. General purpose distribution kernels
which want to enable the feature but keep it disabled by default 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. parameter should have this option unselected.
For those who want to have the feature enabled by default should For those who want to have the feature enabled by default should
select this option (if, for some reason, they need to disable it select this option (if, for some reason, they need to disable it

1
mm/memcontrol.c
View File

@@ -6969,7 +6969,6 @@ struct cgroup_subsys mem_cgroup_subsys = {
#ifdef CONFIG_MEMCG_SWAP #ifdef CONFIG_MEMCG_SWAP
static int __init enable_swap_account(char *s) static int __init enable_swap_account(char *s)
{ {
/* consider enabled if no parameter or 1 is given */
if (!strcmp(s, "1")) if (!strcmp(s, "1"))
really_do_swap_account = 1; really_do_swap_account = 1;
else if (!strcmp(s, "0")) else if (!strcmp(s, "0"))