|
@@ -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
|