The patch titled memsw: deprecate noswapaccount kernel parameter and schedule it for removal has been added to the -mm tree. Its filename is memsw-deprecate-noswapaccount-kernel-parameter-and-schedule-it-for-removal.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: memsw: deprecate noswapaccount kernel parameter and schedule it for removal From: Michal Hocko <mhocko@xxxxxxx> noswapaccount couldn't be used to control memsw for both on/off cases so we have added swapaccount[=0|1] parameter. This way we can turn the feature in two ways noswapaccount resp. swapaccount=0. We have kept the original noswapaccount but I think we should remove it after some time as it just makes more command line parameters without any advantages and also the code to handle parameters is uglier if we want both parameters. Signed-off-by: Michal Hocko <mhocko@xxxxxxx> Requested-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/feature-removal-schedule.txt | 16 ++++++++++++++++ mm/memcontrol.c | 1 + 2 files changed, 17 insertions(+) diff -puN Documentation/feature-removal-schedule.txt~memsw-deprecate-noswapaccount-kernel-parameter-and-schedule-it-for-removal Documentation/feature-removal-schedule.txt --- a/Documentation/feature-removal-schedule.txt~memsw-deprecate-noswapaccount-kernel-parameter-and-schedule-it-for-removal +++ a/Documentation/feature-removal-schedule.txt @@ -603,3 +603,19 @@ Why: The adm9240, w83792d and w83793 har Who: Jean Delvare <khali@xxxxxxxxxxxx> ---------------------------- + +What: noswapaccount kernel command line parameter +When: 2.6.40 +Why: The original implementation of memsw feature enabled by + CONFIG_CGROUP_MEM_RES_CTLR_SWAP could be disabled by the noswapaccount + kernel parameter (introduced in 2.6.29-rc1). Later on, this decision + turned out to be not ideal because we cannot have the feature compiled + in and disabled by default and let only interested to enable it + (e.g. general distribution kernels might need it). Therefore we have + added swapaccount[=0|1] parameter (introduced in 2.6.37) which provides + the both possibilities. If we remove noswapaccount we will have + less command line parameters with the same functionality and we + can also cleanup the parameter handling a bit (). +Who: Michal Hocko <mhocko@xxxxxxx> + +---------------------------- diff -puN mm/memcontrol.c~memsw-deprecate-noswapaccount-kernel-parameter-and-schedule-it-for-removal mm/memcontrol.c --- a/mm/memcontrol.c~memsw-deprecate-noswapaccount-kernel-parameter-and-schedule-it-for-removal +++ a/mm/memcontrol.c @@ -5034,6 +5034,7 @@ __setup("swapaccount", enable_swap_accou 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; } _ Patches currently in -mm which might be from mhocko@xxxxxxx are memsw-handle-swapaccount-kernel-parameter-correctly.patch memsw-deprecate-noswapaccount-kernel-parameter-and-schedule-it-for-removal.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html