mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
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 <[email protected]> Cc: Hiroyuki Kamezawa <[email protected]> Cc: Daisuke Nishimura <[email protected]> Cc: Balbir Singh <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
5b52fc890b
commit
a2c8990aed
2 changed files with 3 additions and 13 deletions
|
|
@ -5169,19 +5169,12 @@ struct cgroup_subsys mem_cgroup_subsys = {
|
|||
static int __init enable_swap_account(char *s)
|
||||
{
|
||||
/* consider enabled if no parameter or 1 is given */
|
||||
if (!(*s) || !strcmp(s, "=1"))
|
||||
if (!strcmp(s, "1"))
|
||||
really_do_swap_account = 1;
|
||||
else if (!strcmp(s, "=0"))
|
||||
else if (!strcmp(s, "0"))
|
||||
really_do_swap_account = 0;
|
||||
return 1;
|
||||
}
|
||||
__setup("swapaccount", enable_swap_account);
|
||||
__setup("swapaccount=", enable_swap_account);
|
||||
|
||||
static int __init disable_swap_account(char *s)
|
||||
{
|
||||
printk_once("noswapaccount is deprecated and will be removed in 2.6.40. Use swapaccount=0 instead\n");
|
||||
enable_swap_account("=0");
|
||||
return 1;
|
||||
}
|
||||
__setup("noswapaccount", disable_swap_account);
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue