aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorMichal Hocko <mhocko@suse.cz>2011-05-24 20:12:50 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-25 11:39:36 -0400
commita2c8990aed5ab000491732b07c8c4465d1b389b8 (patch)
tree1aaac1e831410ac3e59c969f05426315d2054c28 /mm
parent5b52fc890bece77bffb9fade69239f71384ef02b (diff)
memsw: remove noswapaccount kernel parameter
The noswapaccount parameter has been deprecated since 2.6.38 without any complaints from users so we can remove it. swapaccount=0|1 can be used instead. As we are removing the parameter we can also clean up swapaccount because it doesn't have to accept an empty string anymore (to match noswapaccount) and so we can push = into __setup macro rather than checking "=1" resp. "=0" strings Signed-off-by: Michal Hocko <mhocko@suse.cz> Cc: Hiroyuki Kamezawa <kamezawa.hiroyuki@gmail.com> Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> Cc: Balbir Singh <balbir@linux.vnet.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/memcontrol.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 010f9166fa6e..d5fd3dcd3f2e 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -5169,19 +5169,12 @@ struct cgroup_subsys mem_cgroup_subsys = {
5169static int __init enable_swap_account(char *s) 5169static int __init enable_swap_account(char *s)
5170{ 5170{
5171 /* consider enabled if no parameter or 1 is given */ 5171 /* consider enabled if no parameter or 1 is given */
5172 if (!(*s) || !strcmp(s, "=1")) 5172 if (!strcmp(s, "1"))
5173 really_do_swap_account = 1; 5173 really_do_swap_account = 1;
5174 else if (!strcmp(s, "=0")) 5174 else if (!strcmp(s, "0"))
5175 really_do_swap_account = 0; 5175 really_do_swap_account = 0;
5176 return 1; 5176 return 1;
5177} 5177}
5178__setup("swapaccount", enable_swap_account); 5178__setup("swapaccount=", enable_swap_account);
5179 5179
5180static int __init disable_swap_account(char *s)
5181{
5182 printk_once("noswapaccount is deprecated and will be removed in 2.6.40. Use swapaccount=0 instead\n");
5183 enable_swap_account("=0");
5184 return 1;
5185}
5186__setup("noswapaccount", disable_swap_account);
5187#endif 5180#endif