From 9d79d0ece327adcc1a8768db511019931b24081d Mon Sep 17 00:00:00 2001 From: Michal Hocko Date: Tue, 1 Feb 2011 15:52:31 -0800 Subject: [PATCH] --- yaml --- r: 232722 b: refs/heads/master c: 552b372ba9db85751e7db2998f07cca2e51f5865 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/feature-removal-schedule.txt | 16 ++++++++++++++++ trunk/mm/memcontrol.c | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 839163efeb24..e6e84655e0af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fceda1bf498677501befc7da72fd2e4de7f18466 +refs/heads/master: 552b372ba9db85751e7db2998f07cca2e51f5865 diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index b959659c5df4..b3f35e5f9c95 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -603,3 +603,19 @@ Why: The adm9240, w83792d and w83793 hardware monitoring drivers have Who: Jean Delvare ---------------------------- + +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 + +---------------------------- diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c index 44f9f9c89f0c..79abb1fd39d2 100644 --- a/trunk/mm/memcontrol.c +++ b/trunk/mm/memcontrol.c @@ -5034,6 +5034,7 @@ __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; }